Pull request for issue #109

Fixes #109. Generated by conveyor-workflow.