UPD: merge with yupe/master