commit of forgotten changes to security
Merge branch 'master' of github.com:nostlie/Sandbox