Updates on copyright
Merge branch 'abstractj-copyright'