Merge branch 'release/v0.0.1' into develop
Done a little bit of cleanup
Merge branch 'release/v0.0.2'