Pull request for issue #245

Fixes #245. Generated by conveyor-workflow.