First proofreading / editing pass
Merging a good portion of Issue #33, but not all
Merge branch 'jayaddison-develop' into develop