Beta

commit beta (including eric_sandbox) changes back into master