Fixed #72

This time it's in the right branch, hopefully! :D
Merge pull request #80 from Shade-/patch-3

Fixed #72