updates to the IDs
Merge branch 'working-copy'
Merge branch 'master' into gh-pages