added cli options for enabling debug and specifying baseDir
Merge remote-tracking branch 'origin/master'