Sync to dev

Sync to dev
Merge pull request #1 from zhimingyuan/dev

Sync to dev