Improve wording and correct language
Merge pull request #96 from dregad/master

Improve wording and correct language