First attempt at #92.
Merge pull request #796 from dsissitka/patch-1

First attempt at #92.