fixes for Doc files and flags for KratuMain
Merge remote-tracking branch 'upstream/master'