Merge pull request #203 from huyuanzhe/data2

Data2#153 yuanzhe->xiquan
Merge pull request #204 from huyuanzhe/data2

Data2#153 yuanzhe->Wangfeng