UPD: small fixes
Merge pull request #996 from angel-kulikov/master

UPD: small fixes