Merge pull request #56 from wuruilong01/master