Closes #107 : use real CSV parsing