Merge branch 'master' into gh-pages
works! 90%
size 80%
Merge branch 'resize'