CSV and fixed width parser, first draft
Merge remote-tracking branch 'origin/develop' into develop