Fixes #129
Merge pull request #138 from Apsu/master

Fixes #129