Pull request for issue #251

Fixes #251. Generated by conveyor-workflow.