Fix #47
Merge pull request #49 from Clowrid/master

Fix #47