Pull request for issue #115

Fixes #115. Generated by conveyor-workflow.