CSP
Merge pull request #1 from sneezry/master

CSP