Pull request for issue #15

Fixes #15. Generated by git-convey.