[REFACTOR] Plugin related command args
Fixing dumb default structure
Default value changed
Merge pull request #999 from franckstauffer/master

Some fixes