Pull request for issue #168

Fixes #168. Generated by conveyor-workflow.