fixed the license
Merged license changes.