handler some problems
处理冲突
Merge pull request #5 from yickli/master

处理冲突merge