Merge pull request #89 from yupe/master

UPD: small fixes
UPD: small fix
Merge pull request #90 from yupe/master

UPD: merge with yupe/master
Merge branch 'master' of github.com:angel-kulikov/yupe
Merge pull request #91 from yupe/master

UPD: merge with yupe/master
Merge branch 'master' of github.com:angel-kulikov/yupe
UPD: small fix
Merge pull request #940 from angel-kulikov/master

UPD: small fixes