Pull request for issue #227

Fixes #227. Generated by conveyor-workflow.