Pull request for issue #164

Fixes #164. Generated by conveyor-workflow.