Update README.md
Update LICENSE
Merge branch 'master' into develop