Using executor for threads to wait until all theads finished
Merge remote-tracking branch 'origin/master'