Pull request for issue #20

Fixes #20. Generated by git-convey.