First pass at #382
Merge pull request #939 from elcapo/patch-11

First pass at #382