Merge branch 'release/0.2.0' into develop
Fix tests
Update version
Merge branch 'release/0.2.1'