fixes #149
Merge pull request #153 from Kambfhase/master

Fixing #149