Adding files for the merge
Merge pull request #1 from INFN-Catania/master

Adding files for the merge