Merge branch 'release/v1.0.0'
Someone had a problem with the wording
Merge branch 'hotfix/v1.0.1' into develop