Merge pull request #1 from owebboy/master

BETTER CLOCK