Changing clock from 1000 milliseconds to 100
Merge remote-tracking branch 'origin/clock-drift'