upraveny v PC
Merged