Merge pull request #1 from Tux1c/master

Merge pull request #2 from Ryiseld/master
Minor language improvements
Merge pull request #3 from Ryiseld/master

Minor language improvements