First pass at #445
Merge pull request #895 from elcapo/patch-4

First pass at #445