Wording
Merge branch 'hotfix/0.7.1'