Pull request for issue #105

Fixes #105. Generated by conveyor-workflow.