Pull request for issue #207

Fixes #207. Generated by conveyor-workflow.