Pull request for issue #253

Fixes #253. Generated by conveyor-workflow.