Merge "Updated license information"