Merge "Added -p to uptime command on header (and changed it to run always)"