update form ubuntu
update
merge some files