Fixed timestamp combination error
Merge branch 'master' of https://github.com/lstables/clockin1