Pull request for issue #160

Fixes #160. Generated by conveyor-workflow.