Merge pull request #2 from brpc/master