edits per Todd (removed hyphens, etc.)
Merge pull request #613 from jamie-dryad/patch-5

edits per Todd (removed hyphens, etc.)