Fix #99
Merge pull request #100 from Mischanix/issue99

Fix #99