First pass at #291
Merge pull request #755 from mejackreed/patch-6

First pass at #291