Merge pull request #248 from manolo/master

Some fixes and changes related with animations