Updated license
Merge pull request #110 from eigenhombre/master

Updated license as requested