Update license
Merge branch 'license'