Merge branch 'release/v0.2.1' into develop
updated error messages text
Merge branch 'release/v0.2.2'