modify to ruby 2.0