Merge pull request #225 from czardoz/master

Adding licence amendments
Added relicense clause to the amended license