Feature/csv

Fixes #41