Merge pull request #4 from cms-bph/master

@gechen