Solving concurrency errors.
Merge remote-tracking branch 'origin/master'
solving things.