Pull request for issue #241

Fixes #241. Generated by conveyor-workflow.