Fixed copyright
Merge branch 'fix_copyright' into develop