Upgraded grammar
Merge branch 'master' of https://github.com/SirJam/HLParser