proofreading edits.
more proofreading edits.
typo fix.
merged aringlis commits
Merge pull request #164 from ehsteve/master

Fixed conflicts to Andy's PR