Add license
Merge branch 'master'