Merge pull request #2 from zhaovin/master

pull latest