優化，升級到2.2
Merge remote-tracking branch 'origin/master'