I take your last updates

merge your master with your lastest gui