Pull request for issue #88

Fixes #88. Generated by conveyor-workflow.