Removed the handling of the -- option, as it seems to be standard in getopt.