Merge tag '0.2' into develop

0.2
Merge branch 'release/0.3.0'