Fix plugin dependency issues
Merge pull request #20 from level99/master

Fix plugin dependency issues