Sync time
Merge pull request #1 from M42/sync-issues

Sync time