Merge branch 'release/0.0.7' into develop
Merge branch 'release/0.1'