Pull request for issue #324

Fixes #324. Generated by conveyor-workflow.