Fixes #22
Merge pull request #23 from craffel/master

Thanks