Improving parser performance
Merge remote-tracking branch 'upstream/master' into updates