Merge pull request #524 from angel-kulikov/master

UPD: исправил - Undefined index: PATH_INFO
editor fix
Merge pull request #24 from yupe/master

UPD: merge with yupe/master