bug 修复
bug修复2
Merge pull request #2 from sunnyYanan/junfei

Junfei