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

UPD: small fixes