Pull request for issue #201

Fixes #201. Generated by conveyor-workflow.