Pull request for issue #139

Fixes #139. Generated by conveyor-workflow.