Another pass at #474
Merge pull request #1147 from ericburns/patch-1

Another pass at #474