Merge branch 'release/v0.0.6' into develop
Bug fixing.
Merge branch 'release/v0.0.7'