Merge branch 'release/0.2.0' into develop
added button row
Merge branch 'release/0.3.0'