mods to change from ruby-1.9 to ruby-2.0