Pull request for issue #211

Fixes #211. Generated by conveyor-workflow.