Merge pull request #20 from ebranca/dev

Dev
new module clock
Merge pull request #21 from ebranca/master

merge dev and master