readme edit
readme manually merged
fixed