change and shorten (almost) everything
Merge branch 'master' into gh-pages
update