Merge pull request #7 from rolandschulz/master