Merge branch 'release/0.0.1'
Done for 0.0.1