Merge pull request #15 from henrikstranneheim/develop

Develop
Merge pull request #17 from robinandeer/develop

CSV directives
Column conventions started
Merge remote-tracking branch 'upstream/develop' into develop