commit from CERN side
Merge branch 'master' of github.com:rkunnawa/RAA
merging with CERN from MIT