change to ease animation
Merge branch 'master' into gh-pages