Merge branch 'hotfix-0.1.1' into develop