Fixes #108
Merge pull request #109 from krzysztof-o/issue108

Fixes #108