First pass at #368
Merge pull request #780 from mejackreed/patch-8

First pass at #368