Updated for Ruby 1.9.3