Refactored CSV parsing.
Merge pull request #26 from szilardhuber/master

Refactored CSV parsing.