merge
readme updated