Updates to support ruby 2.0.0