update license
Merge branch 'update_license'