Fix of fight angular by Milosz
Merge
Merge branch 'master' into merge_problem