recap update, levels
Merge branch 'master' into gh-pages