Pull request for issue #4

Fixes #4. Generated by conveyor-workflow.