Latest changes
Merge branch 'phase3' of https://github.com/sosaavedra/securecoding into phase3