Merge pull request #27 from zhengzhiren/master

merge
purify warning log
up
up
fix conflict