Added cmdline parsing