First pass at #47
Merge pull request #899 from dmelliott0311/patch-1

First pass at #47