First pass at #196
Merge pull request #979 from fazam/patch-5

First pass at #196