More more fixes
Merge branch 'master' of https://github.com/MykolaShevchuk/girko.git