score 3 update
Merge remote-tracking branch 'origin' into gh-pages
merge