Merge branch 'hotfix/fix_license'
Merge branch 'develop'
Update README.md
Merge branch 'master' into develop