diff --git a/functions.php b/functions.php
index 621f183..07aa85c 100755
--- a/functions.php
+++ b/functions.php
@@ -1,11 +1,13 @@
 <?php
-require_once 'wunderground.php';
+// require_once 'wunderground.php';
+require_once 'openweathermap.php';
 
 define('DEFAULT_WAKE', '6:00');
 define('DEFAULT_SLEEP', '22:00');
 
 define('TWILIGHT_FILE', 'static/twilight_%d.csv');
-define('STATION', 'IUITGEES3');
+define('STATION', 'INOORDHO104');
+define('CITY', 2745978);
 
 function getHour($sTime = null) {
     if (!is_numeric($sTime)) {
@@ -44,9 +46,11 @@ function getSleep(&$aTwilight = null) {
     return strtotime($sWake = isset($aTwilight) ? $aTwilight[3] : DEFAULT_WAKE);
 }
 
-function getTemperature($sStation = STATION) {
-    $aData = wunderground('conditions', sprintf('pws:%s', STATION));
-    return isset($aData['current_observation']['temp_c']) ? $aData['current_observation']['temp_c'] : null;
+function getTemperature($sStation = STATION, $iCity = CITY) {
+    // $aData = wunderground('conditions', sprintf('pws:%s', STATION));
+    // return isset($aData['current_observation']['temp_c']) ? $aData['current_observation']['temp_c'] : null;
+    $aData = openweathermap(CITY);
+    return isset($aData['main']['temp']) ? floatval($aData['main']['temp']) - 273.15 : null;
 }
 
 function command($sCommand) {
diff --git a/inverter.php b/inverter.php
index 87b45fd..30dcc9e 100755
--- a/inverter.php
+++ b/inverter.php
@@ -1,6 +1,5 @@
 #!/usr/bin/php
 <?php
-#ja
 require_once 'functions.php';
 require_once 'daemon.php';
 
diff --git a/openweathermap.php b/openweathermap.php
new file mode 100755
index 0000000..6ac5c87
--- /dev/null
+++ b/openweathermap.php
@@ -0,0 +1,69 @@
+<?php
+define('KEY', 'e8f868de4eb21a7c6a877f8197cc3ed3');
+define('LIMIT_MINUTE', 10);
+define('LIMIT_DAY', 500);
+define('LIMIT_FILE', '/opt/inverter/data/openweathermap.json');
+
+function openweathermap($iCity, $bDebug = false) {
+    /* Get current date values */
+    $iMinute = date('i');
+    $iDay = date('z');
+
+    if (file_exists(LIMIT_FILE)) {
+        /* Read number of calls used */
+        $sJSON = file_get_contents(LIMIT_FILE);
+        $aJSON = json_decode($sJSON, true);
+        $aCount = array(
+            'minute' => $iMinute != $aJSON['minute'][0] ? 0 : $aJSON['minute'][1],
+            'day' => $iDay != $aJSON['day'][0] ? 0 : $aJSON['day'][1]);
+     } else {
+        /* Initialise to zero */
+        $aCount = array(
+            'minute' => 0,
+            'day' => 0);
+    }
+
+    /* Check call limits */
+    $iWait = 0;
+    if ($aCount['minute'] >= LIMIT_MINUTE) {
+        $iWait = 60 - date('s');
+        if ($bDebug === true) {
+            printf("Minute limit (%d) reached, wait %d seconds\n", LIMIT_MINUTE, $iWait);
+        }
+        $aCount['minute'] = 0;
+    } else if ($aCount['day'] >= LIMIT_DAY) {
+        $iWait = strtotime('00:00 + 1 day') - time();    
+        if ($bDebug === true) {
+            printf("Daily limit (%d) reached, wait %d seconds\n", LIMIT_DAY, $iWait);
+        }
+        $aCount['day'] = 0;
+    }
+
+    /* Prevent from exceeding call limits */
+    if ($iWait > 0) {
+        //die("Try again later!\n");
+        return null;
+    }
+
+    /* Update call counts */
+    ++$aCount['minute'];
+    ++$aCount['day'];
+
+    /* Report number of calls used */
+    if ($bDebug === true) {
+        printf("Used %d/%d minutely and %d/%d daily calls\n", $aCount['minute'], LIMIT_MINUTE, $aCount['day'], LIMIT_DAY);
+    }
+
+    /* Write number of calls used to file */
+    $aJSON = array(
+        'minute' => array($iMinute, $aCount['minute']),
+        'day' => array($iDay, $aCount['day']));
+    file_put_contents(LIMIT_FILE, json_encode($aJSON));
+
+    /* Perform actual call */
+    $sUrl = sprintf('https://api.openweathermap.org/data/2.5/weather?id=%d&appid=%s', $iCity, KEY);
+    $sUrl = sprintf('https://api.openweathermap.org/data/2.5/weather?id=%d&appid=%s', $iCity, KEY);
+// $sUrl = 'https://samples.openweathermap.org/data/2.5/weather?q=Uitgeeddst&appid=5fc7ebf9168bfbe9745920438e3b1';
+    $sJSON = file_get_contents($sUrl);
+    return json_decode($sJSON, true);
+}
diff --git a/weather.php b/weather.php
index 3567f76..f739e01 100755
--- a/weather.php
+++ b/weather.php
@@ -1,7 +1,11 @@
 #!/usr/bin/php
 <?php
-require_once 'wunderground.php';
+// require_once 'wunderground.php';
+require_once 'openweathermap.php';
 
-define('STATION', 'INOORDHO104');
-$aData = wunderground('conditions', sprintf('pws:%s', STATION));
-echo $fTemperature = isset($aData['current_observation']['temp_c']) ? $aData['current_observation']['temp_c'] : null;
\ No newline at end of file
+// define('STATION', 'INHASSUM4');
+define('CITY', 2745978);
+
+// $aData = wunderground('conditions', sprintf('pws:%s', STATION));
+$aData = openweathermap(CITY);
+echo $fTemperature = isset($aData['main']['temp']) ? floatval($aData['main']['temp']) - 273.15 : null;
diff --git a/wunderground.php b/wunderground.php
index f815363..4005099 100755
--- a/wunderground.php
+++ b/wunderground.php
@@ -1,5 +1,5 @@
 <?php
-define('KEY', '2556854ea765c351');
+define('KEY', '5fc7ebf9168bfbe9745920438e3b17bf');
 define('LIMIT_MINUTE', 10);
 define('LIMIT_DAY', 500);
 define('LIMIT_FILE', '/opt/inverter/data/wunderground.json');