Added command line option parsing