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

UPD: merge with yupe/master