Evilla

Merged Emanuele Villa requested to merge evilla into master

Update master with the actual code by Emanuele

Merge request reports