Merge pull request #110 from v11985/data#40_wangfeng

Data#40 wangfeng -> yuanzhe
Data#40_yuanzhe:fix unique id bug
Merge pull request #111 from huyuanzhe/Data#40_yuanzhe

Data#40_yuanzhe->wangfeng
OK