Merge pull request #83 from yupe/master

UPD: merge with yupe/master
Merge pull request #84 from yupe/master

UPD: merge with yupe/master
UPD: сделал более наглядным
Merge branch 'master' of github.com:angel-kulikov/yupe
UPD: small fixes
UPD: small fixes
UPD: small fixes
Merge pull request #920 from angel-kulikov/master

UPD: small fixes