Hotfix. See issue 30.
Merge branch 'hotfix-30'