2014/10/20 version
Merge pull request #1 from hfutDev/xuyuan

2014/10/20 version