changed back the animation duration to 1 second
Merge remote-tracking branch 'origin/master'