Merge pull request #16 from tanzhongyibidu/master