Merge pull request #1 from doctrine/master

Update from original
Changes for grammar and clarity
Merge pull request #1096 from simonharris/master

Changes for grammar and clarity