Animation fixes
Merge branch 'master' of https://github.com/marksheppard/TrafficDemo