Merged animation and changes
Merge pull request #21 from Madslick/develop

Merged animation and changes