First pass at #279
Merge pull request #946 from fazam/patch-3

First pass at #279