Fixes #203
Fixes #203
Merge pull request #249 from mtoma/fix-issue-203

Fix issue 203