Some more fixes to the parser.
Merge pull request #106 from Patman64/parser_fixes

Some more fixes to the parser.