Add more locks in update_status
#132
+51
−31
Merged
update_status
#132