Pull request for issue #344

Fixes #344. Generated by conveyor-workflow.