Better CSV parsing
Merge pull request #36 from elcct/master

Better CSV parsing