Merge remote-tracking branch 'chenfengyuan/master'

with more styling changes