Changed some functions after David modifications. Now compiles again in
Unix systems.

Coming back to the previous command line arguments parsing