typo and update copyright year
merge upstream