fix note issue
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
fix issues