fix
merge
Merge branch 'master' of https://github.com/yupe/yupe
Merge pull request #939 from angel-kulikov/master

UPD: small fixes
some fix
Merge branch 'master' of https://github.com/yupe/yupe
Merge pull request #89 from yupe/master

UPD: small fixes