Merge branch 'development'
Hotfix 0.1.1
Merge branch 'hotfix-0.1.1'
Merge branch 'master' into development