Pull request for issue #84

Fixes #84. Generated by conveyor-workflow.