tparisi Merge branch 'Beta-1'