Added getopt