first pass at #186
Merge pull request #763 from fly/patch-2

first pass at #186