First pass at #48
Merge pull request #694 from mandarg/patch-2

First pass at #48