Merge pull request #17 from tanzhongyibidu/master