First pass at #448
Merge pull request #894 from elcapo/patch-3

First pass at #448