Merge remote-tracking branch 'origin/master' into workingBranch
CSVParser cleanup
Merge pull request #6 from julianm3/workingBranch

Working branch