újra
Merge remote-tracking branch 'origin/Terno'