Merge pull request #20 from timothymiko/feature-fragment

Feature fragment
Merge pull request #22 from timothymiko/feature-fragment

Updated anim times