Merge pull request #1 from zhangweifang/dev

update master
Merge pull request #3 from zhangweifang/master

Merge pull request #1 from zhangweifang/dev