Fixes #107
Merge pull request #114 from rpeshkov/fix-for-107

Fixes #107