typo and merge from master