Pull request for issue #92

Fixes #92. Generated by conveyor-workflow.