Merge branch 'tc'
fix background color
Merge branch 'master' into tc