Fixes #124
Merge pull request #217 from mtoma/fix-issue-124

Fixes #124