Changed Author and Identifer as per Ippos suggestion