Changed some things about the parser
Merge branch 'master' into gh-pages