match dev
Merge pull request #3 from TerrorJack/dongchao

match function dev