Fixes #25
Merge branch 'issue-25'