Enhance report
Merge pull request #992 from psav/enhance_report

WIP - Enhance report