Pull request for issue #1

Fixes #1. Generated by git-convey.