fixed angle and animations for 0.9.7
fixed merge