Fixed simultaenous updating of statuses
Merging with master