Fork of http://cfdbplugin.com/ with my small change