first pass on #231
Merge pull request #754 from fly/patch-1

first pass on #231