Merge branch 'release/0.2.0' into develop
bug fixed for transition
up to 0.2.1
Merge branch 'release/0.2.1'