Updates on copyright
Merge branch 'copyright'