adding uptime segment
better uptime resolution
Merge remote-tracking branch 'marcioAlmada/master' into uptime
Lint fixes