Change animation to be quick of toggle switch
Merge branch 'master' into gh-pages