Pull request for issue #136

Fixes #136. Generated by conveyor-workflow.