Update commandline options parser, recombined in single file
Merge branch 'master' of github.com:zzattack/ccmaps-net