Pull request for issue #5

Fixes #5. Generated by conveyor-workflow.