Update license
Merge pull request #60 from SWTI2014/master

Update license