Implemented getopts command line parsing

Also tweaked Doxygen output
Merge remote-tracking branch 'origin/master'