Merge pull request #83 from shuanzi/Data#40_xiquan

Data#40 xiquan
OK
Data#40_yuanzhe:fix bug
Data#40_yuanzhe:merge from xiquan
Merge pull request #84 from huyuanzhe/Data#40_yuanzhe

Data#40 yuanzhe->xiquan