fix ruby version
merge from master