Some minor fixs over clock
Merge pull request #10 from cravacuore/develop

Some minor fixs over clock