First pass at #119
Merge pull request #759 from mejackreed/patch-7

First pass at #119