fix merge
update readme
Merge remote-tracking branch 'origin/patch-1'