Pull request for issue #129

Fixes #129. Generated by conveyor-workflow.