Added the scanning of command line arguments.