Updated for Ruby 2.0