Adds log-file and log-file-level command line args
Merge branch 'issues/616' into develop