fixed some more commit issues
Merge remote-tracking branch 'origin/Multithread'