Pull request for issue #127

Fixes #127. Generated by conveyor-workflow.