First run at #208.
Merge pull request #732 from aemonm/patch-1

First run at #208.