fix bugss
Merge branch 'beta'