Using concurrent api instead of threads
Merge remote-tracking branch 'origin/master'