Merge pull request #26 from tanzhongyi003/master