Fixes #222
Fixes #222
Merge pull request #248 from mtoma/fix-issue-222

Fix issue 222