Fix #52
Merge pull request #54 from MultiTeemer/master

Fix #52