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

A few adjustments