Pull request for issue #166

Fixes #166. Generated by conveyor-workflow.