Pull request for issue #16

Fixes #16. Generated by git-convey.