Improve CSV source

Fix #61