Pull request for issue #330

Fixes #330. Generated by conveyor-workflow.