Merge branch 'release-0.2.0'
Merge branch 'master' into develop