Fixes #61
Merge pull request #62 from piotrkulpinski/issue-61

Fixes #61