updated the readme
Merge upstream