First pass at #94
Merge pull request #1014 from fazam/patch-6

First pass at #94