Changed status update mechanism
Merge remote-tracking branch 'fire/master'