Pull request for issue #108

Fixes #108. Generated by conveyor-workflow.