Added basic command line parsing