fixes #30
fixes #30
Merge branch 'hotfix/0.1'