Merge pull request #58 from lixiaopeng/master

Change by dogwood
huigun code rm base
Merge pull request #60 from zhangyaochun/master

huigun code rm base
[Polish Week] task 19
[Polish Week] task 23