Add copyright notice
update copyright years
merge master