First pass at #63
Merge pull request #744 from mejackreed/patch-3

First pass at #63