First pass at #413
Merge pull request #920 from elcapo/patch-8

First pass at #413