Pull request for issue #247

Fixes #247. Generated by conveyor-workflow.