First attempt at #67.
Merge pull request #881 from dsissitka/patch-6

First attempt at #67.