Added type mapping back, changed split_rows so it's correct
Merge pull request #8 from zmjjmz/master

Added type mapping back, changed split_rows so it's correct