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

Minor language improvements