Fixes #38
Merge branch 'issue-38'