Starting the joyous task of dealing with the parser
Merge branches 'master' and 'symboltable'