Better COLUMN_TYPE calculation
test added
Merge pull request #116 from ignatov/patch-1

Better COLUMN_TYPE calculation