support 1.1 version of CSP
Merge pull request #1134 from patrickkettner/csp-update

support 1.1 version of CSP