First pass at #285
Merge pull request #965 from elcapo/patch-15

First pass at #285