Pull request for issue #116

Fixes #116. Generated by conveyor-workflow.