Update
add and remove items
Merge branch 'master' into gh-pages