First pass at #319
Merge pull request #747 from mejackreed/patch-4

First pass at #319