Added column docs for name and type
Merge remote-tracking branch 'origin/master'