Pull request for issue #217

Fixes #217. Generated by conveyor-workflow.