Changed code to Ruby 2.0.0