Refactored arguments handling in CLI
Merge branch 'master' of github.com:ictspl/spg