Pull request for issue #81

Fixes #81. Generated by conveyor-workflow.