Enhance report
Merge pull request #992 from psav/enhance_report

WIP - Enhance report
Fixed indent
Merge pull request #995 from psav/fix_indent

Fixed indent