Praparing for merge beta and master branches