Merge pull request #2330 from ShabbyX/optimize_for_angle

Optimize for angle