version v4, improvements due to review commments
Merge branch 'master' of ssh://github.com/herndon/FNALComp