Cleaner transition of time when restarting
Merge pull request #147 from dreamteam69/master

Cleaner transition of time when restarting
Merge remote-tracking branch 'upstream/master'