Changed CSV parser, to support quote characters in fields