refactor
Merge remote-tracking branch 'origin/Kolec-dom-1' into Kolec-dom-1