Changes for James
Updates following code review
Merge pull request #3 from JonForest/Feedback

Feedback