Readme, some fixes
fix Readme
fix merge