First pass at #381
Merge pull request #915 from dmelliott0311/patch-3

First pass at #381