Merge branch 'release-0.7.0'
fixing typos
Merge branch 'master' into release-0.7.0