Pull request for issue #125

Fixes #125. Generated by conveyor-workflow.