Pull request for issue #223

Fixes #223. Generated by conveyor-workflow.