Improve parser implementation
Merge branch 'phase1' of https://github.com/sosaavedra/securecoding into phase1