Adding in changes Chris made
Merge pull request #32 from schleppington/chris-test

Adding in changes Chris made