Fixes #170
Merge pull request #205 from mtoma/fix-issue-170

Fixes #170