Updated for GPL requirements