First pass at #358
Merge pull request #707 from deepakhj/patch-2

First pass at #358