Pull request for issue #172

Fixes #172. Generated by conveyor-workflow.