Merge commit 'v0.0.1' into develop