Merge branch 'hotfix/0.1.1'
Merge branch 'master' into develop