Update copyright info
Fix copyright in wrong position
Merge branch 'master' into develop