update to Values

Merged Barbie Graver requested to merge bjg-values into master