Pull request for issue #257

Fixes #257. Generated by conveyor-workflow.