New update
Merge branch 'master' into beta
new update
Merge branch 'beta'