Merge branch 'release/0.2.1' into develop
fix layout field
bumped version
Merge branch 'release/0.2.2'