dev change readme
merge dev and master