Tweaks and fixes to make the parser work correctly
Merge remote-tracking branch 'origin/master'