oprava chyby
Merge remote-tracking branch 'origin/Pavel'