Update license
Merge pull request #287 from maravillas/master

Update license