Pull request for issue #213

Fixes #213. Generated by conveyor-workflow.