Updated for concurrency
Merge pull request #1 from longnguyen11288/patch-1

Updated for concurrency