First pass at #169
Merge pull request #736 from mejackreed/patch-1

First pass at #169