Apply requested wording changes
Merge pull request #135 from timdegroote/wording-changes

Apply requested wording changes