Merge pull request #1 from madsec/master

formatting    ct
edits from proofreader
edits from proofreader
Merge pull request #1 from matt-tha/master

Merge with upstream