Added license
fixed license
Merge branch 'master' into english