fix bugs
12
Merge remote-tracking branch 'origin'
122