Merge pull request #3 from zhaovin/master

pull latest