Merge pull request #1 from zhaovin/master

pull latest