Fixes #39
Merge branch 'issue-39'