Pu/getopt

My pull request