Merge pull request #1 from MinfeiZhou/master

tongbu  lhj
十一次
Merge pull request #5 from tongyou1992/master

shiyici