@synchronized statement added to fix multi-threading crashes
Minor change
Merge remote-tracking branch 'origin/master'