commit z galazki
Merge branch 'galazka'