Command line option processing added