Take a slightly different approach to addressing #204.
Merge pull request #205 from edgecase/feature/issue-204

Take a slightly different approach to addressing #204.