Pull request for issue #128

Fixes #128. Generated by conveyor-workflow.