merge ruby-china

merge ruby-china