The missed change
Fixed merge problems
Merge pull request #7 from INFN-Catania/master

The missed change