First attempt at #446
Merge pull request #599 from rwinikates/patch-1

First attempt at #446