Merge pull request #559 from angel-kulikov/master

UPD: fix #554 Неправилный редирект на логин
Merge pull request #29 from yupe/master

UPD: merge with yupe/master