Pull request for issue #231

Fixes #231. Generated by conveyor-workflow.