Merge pull request #13 from tanzhongyibidu/master