commandline option for setting num threads
changed parameter name
Merge branch 'master' into benchmark
benchmark script