Pull request for issue #89

Fixes #89. Generated by conveyor-workflow.