Fixed add/setAnimation in event callback.

closes #137
Merge branch 'origin/master'
Comments.
Merge remote-tracking branch 'upstream/master'