UPD: merge with yupe/master

UPD: small fixes