Some fixes
Merge remote-tracking branch 'origin/master'
«Split screen»
Merge remote-tracking branch 'origin/master'
solve conflicts!