Fix #97
Merge pull request #98 from F1ynn/master

Fix #97