Merge branch 'working-copy'
updated incorrect term
Merge branch 'master' into gh-pages