Beta

merged beta branch