First pass at #68
Merge pull request #929 from fazam/patch-2

First pass at #68