Changed matching & CSV parser to read in universal binary mode