First pass at #374
Merge pull request #942 from elcapo/patch-12

First pass at #374