more reliable fade in
forgot to hide first
Merge branch 'master' into gh-pages