Adding some more thorough tests to validate the command line arguments
Fixing issue #5 and cleaning up from previous commit for #6 (now that the issue should be fixed
Refactoring main program down since it was generating a gendarme warning