First pass at #447
Merge pull request #697 from deepakhj/patch-1

First pass at #447