First pass on #438
Merge pull request #641 from moizsyed/patch-1

First pass on #438