Pull request for issue #7

Fixes #7. Generated by conveyor-workflow.