UPD: small fixes
Merge branch 'master' of github.com:angel-kulikov/yupe
Merge pull request #963 from angel-kulikov/master

UPD: small fixes