Some fix
Rewritting the arguments detection process and fix bugs
Removing extra licence file
Merge branch 'develop'