diff --git a/.gitignore b/.gitignore
index 348226d..ce0fb10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,8 @@ src/server/WebServer.o
 src/server/WebSocket.o
 src/server/dispatcher-client.o
 src/server/main.o
+src/server/moc_AuthorizationManager.cpp
+src/server/moc_AuthorizationManager.o
 src/server/moc_WebServer.cpp
 src/server/moc_WebServer.o
 src/server/moc_WebSocket.cpp
diff --git a/api/classes/systeminfo.rst b/api/classes/systeminfo.rst
index c6cd0e2..919f013 100644
--- a/api/classes/systeminfo.rst
+++ b/api/classes/systeminfo.rst
@@ -32,7 +32,8 @@ Battery Information
 ===================
 
 The "batteryinfo" action will indicate whether or not a battery exists. If it does, it will also report its current charge percentage level (1-99) and its
-status (offline, charging, on backup, or unknown).
+status (offline, charging, on backup, or unknown) and estimated time left (in seconds)
+timeleft (1-XXXXXX)
 
 **REST Request**
 
@@ -148,4 +149,4 @@ For each mounted device, the response will include the device name, filesystem,
   "id": "fooid",
   "name": "response",
   "namespace": "sysadm"
- }
\ No newline at end of file
+ }
diff --git a/src/library/sysadm-systeminfo.cpp b/src/library/sysadm-systeminfo.cpp
index e3a71a7..2dce509 100644
--- a/src/library/sysadm-systeminfo.cpp
+++ b/src/library/sysadm-systeminfo.cpp
@@ -55,6 +55,27 @@ QJsonObject SysInfo::batteryInfo(){
   return retObject;
 }
 
+QJsonObject SysInfo::cpuTemps() {
+
+  // Make sure coretemp is loaded
+  if ( General::RunCommand("kldstat").indexOf("coretemp") == -1 )
+    General::RunCommand("kldload coretemp");
+
+  QJsonObject retObject;
+  QStringList temps;
+  temps = General::RunCommand("sysctl -ai").split("\n").filter(".temperature:");
+  temps.sort();
+  for(int i=0; i<temps.length(); i++){
+    if(temps[i].contains(".acpi.") || temps[i].contains(".cpu")){
+      retObject.insert(temps[i].section(":", 0, 0).section(".", 1,2).replace(".", "").simplified(), temps[i].section(":", 1,5).simplified());
+    }else{
+      //non CPU temperature - skip it
+      temps.removeAt(i); i--;
+    }
+  }
+  return retObject;
+}
+
 // ==== ExternalDevicePaths() ====
 QJsonObject SysInfo::externalDevicePaths() {
   QJsonObject retObject;
diff --git a/src/library/sysadm-systeminfo.h b/src/library/sysadm-systeminfo.h
index b090134..813f2a4 100644
--- a/src/library/sysadm-systeminfo.h
+++ b/src/library/sysadm-systeminfo.h
@@ -15,6 +15,7 @@ namespace sysadm{
 class SysInfo{
 public:
 	static QJsonObject batteryInfo();
+	static QJsonObject cpuTemps();
 	static QJsonObject externalDevicePaths();
 };
 	
diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 70f344c..4d308df 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -255,14 +255,18 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmSystemInfoRequest(const QJso
     bool ok = false;
     if(keys.contains("action")){
       QString act = JsonValueToString(in_args.toObject().value("action"));
-      if(act=="externalmounts"){
-	ok = true;
-        out->insert("externalmounts", sysadm::SysInfo::externalDevicePaths());
-      }
       if(act=="batteryinfo"){
 	ok = true;
         out->insert("batteryinfo", sysadm::SysInfo::batteryInfo());
       }
+      if(act=="cputemps"){
+	ok = true;
+        out->insert("cputemps", sysadm::SysInfo::cpuTemps());
+      }
+      if(act=="externalmounts"){
+	ok = true;
+        out->insert("externalmounts", sysadm::SysInfo::externalDevicePaths());
+      }
 
     } //end of "action" key usage