merge beta version

merge beta version