Pull request for issue #158

Fixes #158. Generated by conveyor-workflow.