Added --version and --help
optimized