First pass at #414
Merge pull request #918 from elcapo/patch-7

First pass at #414