Merge branch 'hotfix/updates'
Update license
Merge branch 'hotfix/minor' into develop