fix some bug
merge last version