First attempt at #121
Merge pull request #1037 from anmonteiro/patch-2

First attempt at #121