Commit
Edits and code updates
Merge pull request #1 from rosslaird/master

Updated text and code