Updated for ruby 2.2.0p0