Updated to Ruby 1.9 syntax