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