Added a cpu_count flag to override the default cpu count value.
Merge remote branch 'github/master'