Merge pull request #1 from zhangweifang/dev

update master