master1
Merge branch 'beta3'
beta4