First pass at #473
Merge pull request #1005 from elcapo/patch-17

First pass at #473