fixy
Merge branch 'br1' po fixie