sync updates from svn
Merge pull request #5 from CMSCompOps/SVNsync

sync updates from svn