use a time.Ticker instead of the time.Sleep
Merge remote-tracking branch 'attilaolah/use-ticker'
Use time.Tick everywhere else we should, too