Moved to separate file, added easing
Added some explanations in code
removed typo
Merge remote-tracking branch 'origin/master'