Adjusted files for Ruby 2.0