Merge branch 'hotfix/0.1.1' into develop
Added title
Merge branch 'release/0.2'