change maxTask to 100
Merge branch 'master' into wj_dev