Pull request for issue #225

Fixes #225. Generated by conveyor-workflow.