First pass at #305
Merge pull request #967 from dmelliott0311/patch-6

First pass at #305