improved Animation class logic
Merge branch 'IvayloBotusharov'