Modified readme
Fixed merge