Cop rework
Merge pull request #19 from gamekeller/cop-changes

Rework of Cop