Fix typos
Fix typos
Fix typos
Merge pull request #579 from wakeup/master

Improve wording and fix typos