Pull request for issue #86

Fixes #86. Generated by conveyor-workflow.