UPD: merge with yupe-ext/master