Beta

merge back to master (including eric-sandbox branch edits)