Various changes
Merge branch 'release/v0.0.3' into develop