Merge pull request #1 from cms-sw/comp

Comp