Merge pull request #86 from yupe/master

UPD: merge with yupe/master
UPD: убрали "проседание" на винде
Merge branch 'master' of github.com:angel-kulikov/yupe
UPD: fix condition in index.php
Merge pull request #935 from angel-kulikov/master

UPD: small fixes