First pass at #308
Merge pull request #751 from mejackreed/patch-5

First pass at #308