Merge branch 'hotfix/0.1.1'
Merge branch 'release/0.2'