Pull request for issue #170

Fixes #170. Generated by conveyor-workflow.