Pull request for issue #138

Fixes #138. Generated by conveyor-workflow.