First attempt at #65.
Merge pull request #872 from dsissitka/patch-5

First attempt at #65.