Chris update
Merge pull request #1 from polyphant1/test_chris

Chris update
Merge pull request #1 from itrharrison/master

merge master