Pull request for issue #237

Fixes #237. Generated by conveyor-workflow.