uprava interface
Merge origin/master