Much improved the parsing of command line, via apache commons cli