First attempt at #404.
Merge pull request #889 from dsissitka/patch-8

First attempt at #404.