Merge pull request #77 from yupe/master

UPD: merge with yupe/master
UPD: правки по index.php
UPD: правки по index.php
Merge pull request #877 from angel-kulikov/master

UPD: правки по index.php