Master

Pulling in the updates on the master branch from original COPS