Tested and tightened
Merge pull request #66 from aspett/feature/127-cc_security

Tested and tightened