First attempt at #360
Merge pull request #925 from rayashman/patch-1

First attempt at #360