by xiaoyuan
resolve confilct
Merge pull request #3 from wangxiaoyuan/master

reslove conflict