Some editorial fixes
Merge pull request #309 from summerwind/master

Some editorial fixes