Merge pull request #79 from yupe/master

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

UPD: small fixes