Merge pull request #1 from AAROC/master

Update Bruce changes
Merge pull request #26 from INFN-Catania/master

Merge pull request #1 from AAROC/master