some changes that Chris and Dave made
Merge pull request #1 from cparratto/patch-1

some changes that Chris and Dave made