Update develop to release v0.0.1

Merge master into develop