add animation
Merge branch 'add-animation'