Fixed command line option parsing