Many changes performed
Merge branch 'master' of https://github.com/bogdan-matsiakh/zlochin