Oct 10 code review
Merge pull request #1 from bdjewkes/Suggestions

Oct 10 code review