Close #35, csv parsing issue