upstream changes
update and move to ruby 2.0