Fixes #131
Merge pull request #136 from Apsu/issue131

Fixes #131