Adjustments to Austin's commit
Merge pull request #49 from eparsons/austinpullrequest

Adjustments to Austin's commit