Fixed formatting, fixed concurrency errors
Merge remote-tracking branch 'origin/master'