Pull request for issue #219

Fixes #219. Generated by conveyor-workflow.