Fixed animations
Merge origin/master