major modifications
Merge branch 'master' of https://github.com/dmitryhits/testbeam