merge pull request and change a bit plugin detection part