ClockStuff from here 42bf1be5fbeaab01131bc2c56d879fc7c82fb1f6
Merge pull request #7 from benjamingoodwin/cm-10.1

ClockStuff from here 42bf1be5fbeaab01131bc2c56d879fc7c82fb1f6