Fix clock for latest version
Merge remote-tracking branch 'windwakr/master'