beta
Merge pull request #1 from dupengtao/dev

beta