Merge pull request #6 from jaake/master

...