Initial structure changes for adding more command line options
Help output added
Version number as constant
Merge remote-tracking branch 'upstream/master'