bugfixes
Merge branch 'hotfix/0.1.1.a'