Merge tag 'v0.2.0' into develop

v0.2.0
Merge branch 'master' into develop