WhiteClock 2.0
Merge pull request #1404 from leoj3n/white-clock-2.0

WhiteClock 2.0