Pull request for issue #176

Fixes #176. Generated by conveyor-workflow.