Improve CSV source
Merge pull request #66 from pmerienne/improve_csv_source

Improve CSV source