Pull request for issue #162

Fixes #162. Generated by conveyor-workflow.