First pass at #383
Merge pull request #937 from elcapo/patch-10

First pass at #383