Updating combining functions and combining new data
Merge branch 'master' into gh-pages