Refactor of Codox option defaults
Merge remote-tracking branch 'upstream/master'