readme,style/fixing
merge