fixing infinite loop
Merge branch 'develop' into angle_by_accel