Security first draft, gonna merge with meric's commit
Merge branch 'master' of https://github.com/pacaci/devcloud