Pull request for issue #221

Fixes #221. Generated by conveyor-workflow.