Updated to Ruby 2