Merge pull request #82 from yupe/master

UPD: merge with yupe/master
fix i18n
Merge pull request #911 from angel-kulikov/master

UPD: small fixes