Updated for ruby 2.0