0.2 release squash merge from develop
Merge branch 'release/release-0.2'