Pull request for issue #90

Fixes #90. Generated by conveyor-workflow.