Novo reporting done
Merge origin/master