level update, RIP admiral
Merge branch 'master' into gh-pages