First pass at #170
Merge pull request #740 from mejackreed/patch-2

First pass at #170