First pass at #316
Merge pull request #775 from cbumgard/patch-1

First pass at #316