Pull request for issue #259

Fixes #259. Generated by conveyor-workflow.