Merge pull request from RubyLouvre/master

合并更新