millxing Merge pull request #48 from justmat/justmat-clock-update