getopt
Merge branch 'conf'