some updates
Merge pull request #3 from clseitz/CMSSW_7_0_4

some updates