Merge pull request #3 from cms-bph/master

merge