enable passing parameters via command line (-D) switches
Merge branch 'toolconf'