Merge branch 'release/0.2.0'
Merge tag '0.2.0' into develop

fixes