Review security
uniformize list
Merge pull request #100 from cbonnissent/reviewSecurity

Review security