[+FEAT] Upgrad to latest version, use block instead of a preg_match, moved locations.