Animation finished, need to implement control method + data output
Merge remote-tracking branch 'upstream/master'