copyright
Merge branch 'beta2'