Added more to the parser
Merge branch 'master' of https://github.com/adisonic/comp2212