Merge pull request #7 from robervalwalsh/cmssw73X

merge from cmssw73X
Merge pull request #8 from robervalwalsh/cmssw72X

Merge pull request #7 from robervalwalsh/cmssw73X