dev
Merge pull request #4 from TerrorJack/dongchao

dev