First pass at #222
Merge pull request #720 from deepakhj/patch-3

First pass at #222