Fixed issue #1 - Add command line switches with getopt