Clock added
minor changes
bug fix
Merge pull request #1 from ikar2000/master

sync