Added Thread number selection options
Merge origin/CodeTesting into CodeTesting