Merge branch 'develop'
Version 0.1.1 changes
Merge branch 'hotfix/0.1.1' into develop