Merge branch 'multiple-values-implementation' into gh-pages