Fixed: addUniqueArg method is not handle correctly the unique args addition
Added support for CC
Merge pull request #145 from bsorin/Fix-addUniqueArg

Fixed: addUniqueArg method is not handle correctly the unique args addition
Fix conflicts and linting
Merge branch 'bsorin-Support-CC'