First pass at #35
Merge pull request #910 from fazam/patch-1

First pass at #35