Supposedly fixes #108
Merge pull request #109 from lolmaus/patch-3

Supposedly fixes #108