Fixes #27.
Merge branch 'hotfix-issue27'