Merge beta development branch to master