增强了兼容性，现在更通用了

Signed-off-by: Meathill <meathill@gmail.com>