Adding option parser
fixed merge errors