Updated the license to be more meaningful ;)
Merged from pulle req.