Merge pull request #958 from angel-kulikov/master

UPD: правки по #534 и fix #955
Merge pull request #959 from angel-kulikov/master

UPD: small fixes
Merge pull request #96 from yupe/master

UPD: merge with yupe/master