Updated license
Merge pull request #3 from wyager/master

Updated license