Merge pull request #1 from Kira-sempai/master

Внес поправки в код
Fixes from field experience
Merge pull request #2 from kaapyth0n/master

fixes from field experience