Updated for Ruby 2.x