Tweak report output
Merge branch 'release/0.8.1'