Pull request for issue #80

Fixes #80. Generated by conveyor-workflow.