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

UPD: small fixes