Added simple argument parsing