Code cleanup, version increase
Merge branch 'release/v0.2.0' into development