Merge branch 'release/v0.2.0'
Merge branch 'hotfix/29' into develop