Fixed stling, animation.
Merge branch 'master' into gh-pages

"Merge"