bugfix
Merge branch 'hotfix/0.3.1'