Pull request for issue #137

Fixes #137. Generated by conveyor-workflow.