Fixes #129
Merge pull request #186 from mtoma/fix-issue-129

Fixes #129