Added animation
Resolved conflicts
Merge pull request #2 from toshipon/patch-1

Added animation