update readme
some changes
Merge branch