Merge pull request #385 from edgy360/master

Launch the doctor within Terminal as a temporary fix for #374
Fixed #349 (Add Trace Directory Option)