First pass at #420
Merge pull request #898 from elcapo/patch-6

First pass at #420