Merge pull request #48 from angathorion/master

Fixes #47