First pass at #373
Merge pull request #943 from elcapo/patch-13

First pass at #373