Pull request for issue #233

Fixes #233. Generated by conveyor-workflow.