Renamed options and added --version option