Merge branch 'Beta_1.0'