Fixes #6
Merge pull request #28 from angathorion/master

Fixes #6