mod by dev branch
Merge pull request #1 from smalllixin/dev

mod by dev branch