Slight optimisation of filtering out matches
Updated language definitions and README