update style
Merge origin/master