Update about license
Update README.md
Update README.md
Merge branch 'upstream'