Bugfixes to csv2json script.
Merge branch 'my'