Fixes #53
Merge branch 'issue-53'