Added Getopt::Long support
Merge branch 'clioptions'