Command line parsing improved
Command line parsing improved