Minor changes.
Merge branch 'release/v0.0.9-0.2' into develop