Merge pull request #181 from polynickglot/master

Add new clock