Pull request for issue #117

Fixes #117. Generated by conveyor-workflow.