Fixes #236
Merge pull request #2 from mtoma/fix-issue-236

Fixes #236