Pull request for issue #9

Fixes #9. Generated by conveyor-workflow.