Merge pull request #1 from cms-analysis/master

Pulling combine HEAD into my master