Modified column type
Removed
Merge remote-tracking branch 'upstream/master'