Pull request for issue #203

Fixes #203. Generated by conveyor-workflow.