Pull request for issue #82

Fixes #82. Generated by conveyor-workflow.