Merge pull request #8 from cloudsleuth/master

Fix typos due to search and replace gone bad.
Additional edits