reduce master branch  files
merge from master