Pull request for issue #12

Fixes #12. Generated by git-convey.