Merge branch 'develop'
Merge branch 'develop'
Prepare 0.2.0 release
Update changelog
Merge branch 'master' into develop