initial commit
readme merge fixes