Added CSV parsing, fixed? the regexp