dev
Merge pull request #1 from shiguofeng/dev

merge dev, add some th