Moar editorial fixes
Merge pull request #32 from pao/patch-5

Moar editorial fixes