Merge pull request #3 from Ryiseld/master

Minor language improvements