add some notes...
solve a bug....
Merge remote-tracking branch 'origin/master'