Progres on #58
Merge branch 'master' of github.com:CERN/atlas-adepo