Pull request for issue #255

Fixes #255. Generated by conveyor-workflow.