Another interim commit.
Merge branch 'issue41' into develop
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two.git into develop