Refactored CLI to avoid duplication and added support for extra arguments
Merge pull request #6 from ismaGNU/feature/cli-refactor

CLI Refactor