Change license
Merge pull request #264 from travis/license

Change license