Updates for ruby 2.0