CSV import fixes
Merge pull request #235 from vomikan/master

CSV import fixes