values argument added - data.frame that pass values to replace in data and base (if specified)