dokoncene strankovani
Merge origin/master