Fixes #193
Merge pull request #250 from mtoma/fix-issue-193

Fixes #193