Pull request for issue #235

Fixes #235. Generated by conveyor-workflow.