Adding protions of code that were removed during a previous merge.
Merge pull request #10 from rgreinho/feature/separate_cli_and_extraction_logic

Adding protions of code that were removed during a previous merge.