Merge branch 'release/0.7' into develop
Fixed some formatting mistakes.
Merge branch 'develop'