Pull request for issue #18

Fixes #18. Generated by conveyor-workflow.