merge all to master

last version