Now waits a second before updating
Merge remote-tracking branch 'origin/master'