Fixes #157
Merge pull request #158 from mlorbetske/master

Fixes #157