cleanup
allow to set number of threads from mathematica
cleanup
Merge branch 'master' into mac