fix column. close #331
Merge remote-tracking branch 'origin/master'