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

UPD: small fixes