Added uptime to sysinfo
Merge