Further bugfix. Added getopt.