First pass at #387
Merge pull request #923 from elcapo/patch-9

First pass at #387