Seems better...
Merge pull request #607 from stephlag/patch-1

Seems better...