diff --git a/fhem/FHEM/12_OilFox.pm b/fhem/FHEM/12_OilFox.pm
new file mode 100644
index 000000000..4b5e95dc0
--- /dev/null
+++ b/fhem/FHEM/12_OilFox.pm
@@ -0,0 +1,501 @@
+# $Id$
+####################################################################################################
+#
+#	12_OilFox.pm
+#
+#	Copyright: Stephan Eisler
+#	Email: stephan@eisler.de 
+#
+#	This file is part of fhem.
+#
+#	Fhem is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 2 of the License, or
+#	(at your option) any later version.
+#
+#	Fhem is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with fhem.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+package main;
+
+use strict;
+use warnings;
+use Time::Local;
+use JSON;
+use HttpUtils;
+use Blocking;
+use Data::Dumper;
+
+use constant API => "https://api.oilfox.io/v3/";
+
+sub OilFox_Initialize($) {
+    my ($hash) = @_;
+    
+    $hash->{SetFn}      = "OilFox_Set";
+    $hash->{DefFn}      = "OilFox_Define";
+    $hash->{UndefFn}    = "OilFox_Undef";
+    $hash->{NotifyFn} 	= "OilFox_Notify";
+    $hash->{AttrFn}     = "OilFox_Attr";
+    $hash->{AttrList}   = "email " .
+                          "password " .
+                          "oilfox " .
+                          "interval " .
+                          $readingFnAttributes;
+}
+
+sub OilFox_Define($$){
+    my ( $hash, $def ) = @_;
+    my @a = split( "[ \t]+", $def );
+    my $name = $a[0];
+
+    return "too few parameters: define <NAME> OilFox" if( @a < 1 ) ;
+
+    %$hash = (%$hash,
+        NOTIFYDEV => "global,$name",
+        OilFox => { 
+            CONNECTED				            => 0,
+            oilfox                              => 0,
+            oilfox_id                           => '',
+            token					            => '',
+            oilfox_name				            => '',
+            oilfox_hwid				            => '',
+            oilfox_tankVolume 		            => 0,
+            oilfox_metering_value               => 0,
+            oilfox_metering_fillingPercentage   => 0,
+            oilfox_metering_liters              => 0,
+            oilfox_metering_currentOilHeight    => 0,
+            oilfox_metering_battery             => 0,
+            email 				                => '',
+            password 				            => '',
+            interval    			            => 300,
+            expires 					        => time(),
+        },
+    );
+    
+    $attr{$name}{room} = "OilFox" if( !defined( $attr{$name}{room} ) );
+    
+    OilFox_CONNECTED($hash,'initialized');
+
+    OilFox_DoUpdate($hash);
+
+    return undef;
+
+}
+
+sub OilFox_Set($@) {
+    my ($hash,@a) = @_;
+    return "\"set $hash->{NAME}\" needs at least an argument" if ( @a < 2 );
+    my ($name,$setName,$setVal,$setVal2,$setVal3) = @a;
+
+    Log3 $name, 3, "$name: set called with $setName " . ($setVal ? $setVal : "") if ($setName ne "?");
+
+    if (OilFox_CONNECTED($hash) eq 'disabled' && $setName !~ /clear/) {
+        return "Unknown argument $setName, choose one of clear:all,readings";
+        Log3 $name, 3, "$name: set called with $setName but device is disabled!" if ($setName ne "?");
+        return undef;
+    }
+    
+    if ($setName !~ /update/) {
+        return "Unknown argument $setName, choose one of update";
+    } else {
+        Log3 $name, 3, "$name: set $setName";
+    }
+
+    if ($setName eq 'update') {
+        RemoveInternalTimer($hash);
+        OilFox_DoUpdate($hash);
+    }
+    
+    return undef;
+}
+
+sub OilFox_Notify($$) {
+    
+    my ($hash,$dev) = @_;
+    my ($name) = ($hash->{NAME});
+    
+    if (AttrVal($name, "disable", 0)) {
+        Log3 $name, 5, "Device '$name' is disabled, do nothing...";
+        OilFox_CONNECTED($hash,'disabled');
+        return undef;
+    }
+
+    my $devname = $dev->{NAME};
+    my $devtype = $dev->{TYPE};
+    my $events = deviceEvents($dev,1);
+    return if (!$events);
+    
+    Log3 $name, 5, "OilFox ($name) - Notify: " . Dumper $events;
+
+    $hash->{OilFox}->{updateStartTime} = time();    
+    
+    if ( $devtype eq 'Global') {
+        if (
+            grep /^INITIALIZED$/,@{$events}
+            or grep /^REREADCFG$/,@{$events}
+            or grep /^DEFINED.$name$/,@{$events}
+            or grep /^MODIFIED.$name$/,@{$events}
+        ) {
+            OilFox_APIAuth($hash);
+        }
+    } 
+    
+    if ( $devtype eq 'OilFox') {
+        if ( grep(/^state:.authenticated$/, @{$events}) ) {
+            OilFox_get($hash);
+        }
+        
+        if ( grep(/^state:.disconnected$/, @{$events}) ) {
+            Log3 $name, 3, "Reconnecting...";
+            OilFox_APIAuth($hash);
+        }
+        
+        if ( grep(/^state:.connected$/, @{$events}) ) {
+            OilFox_DoUpdate($hash);
+        }
+    }
+            
+    return undef;
+}
+
+sub OilFox_Attr(@) {
+    
+    my ( $cmd, $name, $attrName, $attrVal ) = @_;
+    my $hash = $defs{$name};
+        
+    if( $attrName eq "disable" ) {
+        if( $cmd eq "set" and $attrVal eq "1" ) {
+            RemoveInternalTimer($hash);
+            readingsSingleUpdate ( $hash, "state", "disable", 1 );
+            Log3 $name, 3, "$name - disabled";
+        }
+
+        elsif( $cmd eq "del" ) {
+            readingsSingleUpdate ( $hash, "state", "active", 1 );
+            Log3 $name, 3, "$name - enabled";
+        }
+    }
+    
+    elsif( $attrName eq "email" ) {
+        if( $cmd eq "set" ) {
+            $hash->{OilFox}->{email} = $attrVal;
+            Log3 $name, 3, "$name - email set to " . $hash->{OilFox}->{email};
+        }
+    }
+
+    elsif( $attrName eq "password" ) {
+        if( $cmd eq "set" ) {
+            $hash->{OilFox}->{password} = $attrVal;
+            Log3 $name, 3, "$name - password set to " . $hash->{OilFox}->{password};	
+        }
+    }
+    
+    elsif( $attrName eq "oilfox" ) {
+        if( $cmd eq "set" ) {
+            $hash->{OilFox}->{oilfox} = $attrVal;
+            Log3 $name, 3, "$name - oilfox set to " . $hash->{OilFox}->{oilfox};	
+        }
+        elsif( $cmd eq "del" ) {
+            $hash->{OilFox}->{oilfox} = 0;
+            Log3 $name, 3, "$name - deleted oilfox and set to default: 0";
+        }
+    }
+
+    elsif( $attrName eq "interval" ) {
+        if( $cmd eq "set" ) {
+            return "Interval must be greater than 0"
+            unless($attrVal > 0);
+            $hash->{OilFox}->{interval} = $attrVal;
+            RemoveInternalTimer($hash);
+            InternalTimer( time() + $hash->{OilFox}->{interval}, "OilFox_DoUpdate", $hash);
+            Log3 $name, 3, "$name - set interval: $attrVal";
+        }
+
+        elsif( $cmd eq "del" ) {
+            $hash->{OilFox}->{interval} = 300;
+            RemoveInternalTimer($hash);
+            InternalTimer( time() + $hash->{OilFox}->{interval}, "OilFox_DoUpdate", $hash);
+            Log3 $name, 3, "$name - deleted interval and set to default: 300";
+        }
+    }
+
+    return undef;
+}
+
+
+sub OilFox_Undef($$){
+    my ( $hash, $arg )  = @_;
+    my $name            = $hash->{NAME};
+    my $deviceId        = $hash->{DEVICEID};
+    delete $modules{OilFox}{defptr}{$deviceId};
+    RemoveInternalTimer($hash);
+    return undef;
+}
+
+
+sub OilFox_APIAuth($) {
+    my ($hash, $def) = @_;
+    my $name = $hash->{NAME};
+    
+    my $email = $hash->{OilFox}->{email};
+    my $password = $hash->{OilFox}->{password};
+    
+    my $header = "Content-Type: application/json\r\nAccept: application/json";
+    my $json = '{
+                    "email" : "' . $email. '",
+                    "password" : "' . $password. '"
+                }';
+
+    HttpUtils_NonblockingGet({
+        url        	=> API . "login",
+        timeout    	=> 5,
+        hash       	=> $hash,
+        method     	=> "POST",
+        header     	=> $header,  
+        data 		=> $json,
+        callback   	=> \&OilFox_APIAuthResponse,
+    });  
+    
+}
+
+sub OilFox_APIAuthResponse($) {
+    my ($param, $err, $data) = @_;
+    my $hash = $param->{hash};
+    my $name = $hash->{NAME};
+
+    if($err ne "") {
+        OilFox_CONNECTED($hash,'error');
+        Log3 $name, 2, "error while requesting ".$param->{url}." - $err";     
+                                           
+    } elsif($data ne "") {
+   
+        my $result = eval { decode_json($data) };
+        if ($@) {
+            Log3( $name, 2, " - JSON error while request: $@");
+            return;
+        }
+            
+        if ($result->{errors}) {
+            OilFox_CONNECTED($hash,'error');
+            Log3 $name, 2, "Error: " . $result->{errors}[0]->{detail};
+            
+        } else {
+            Log3 $name, 2, "$data"; 
+
+            $hash->{OilFox}->{token} = $result->{access_token};
+            $hash->{OilFox}->{expires} = time() + 300; # TODO Read exp from JWT
+            
+            readingsBeginUpdate($hash);
+            readingsBulkUpdate($hash,'token',$hash->{OilFox}->{token} );
+            
+            my $expire_date = strftime("%Y-%m-%d %H:%M:%S", localtime($hash->{OilFox}->{expires}));
+            readingsBulkUpdate($hash,'expires',$expire_date );
+            readingsEndUpdate($hash, 1);
+            
+            OilFox_CONNECTED($hash,'authenticated');
+
+        }
+        
+    }
+
+}
+
+sub OilFox_CONNECTED($@) {
+    my ($hash,$set) = @_;
+    if ($set) {
+       $hash->{OilFox}->{CONNECTED} = $set;
+       %{$hash->{updateDispatch}} = ();
+       if (!defined($hash->{READINGS}->{state}->{VAL}) || $hash->{READINGS}->{state}->{VAL} ne $set) {
+               readingsSingleUpdate($hash,"state",$set,1);
+       }
+       return undef;
+    } else {
+        if ($hash->{OilFox}->{CONNECTED} eq 'disabled') {
+            return 'disabled';
+        }
+        elsif ($hash->{OilFox}->{CONNECTED} eq 'connected') {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}
+
+sub OilFox_DoUpdate($) {
+    my ($hash) = @_;
+    my ($name) = $hash->{NAME};
+
+    Log3 $name, 5, "doUpdate() called.";
+
+    if (OilFox_CONNECTED($hash) eq "disabled") {
+        Log3 $name, 3, "$name - Device is disabled.";
+        return undef;
+    }
+
+    if (time() >= $hash->{OilFox}->{expires} ) {
+        Log3 $name, 2, "LOGIN TOKEN MISSING OR EXPIRED";
+        OilFox_CONNECTED($hash,'disconnected');
+
+    } elsif ($hash->{OilFox}->{CONNECTED} eq 'connected') {
+        Log3 $name, 4, "Update with device: " . $hash->{OilFox}->{oilfox_hwid} . " Interval:". $hash->{OilFox}->{interval};
+        OilFox_get($hash);
+        InternalTimer( time() + $hash->{OilFox}->{interval}, "OilFox_DoUpdate", $hash);
+    } 
+
+}
+
+sub OilFox_get($) {
+    my ($hash) = @_;
+    my ($name) = $hash->{NAME};
+
+    my $token = $hash->{OilFox}->{token};
+    my $header = "Content-Type: application/json\r\nAccept: application/json\r\nAuthorization: Bearer " . $token;
+
+    HttpUtils_NonblockingGet({
+        url        	=> API . "user/summary",
+        timeout    	=> 5,
+        hash       	=> $hash,
+        method     	=> "GET",
+        header     	=> $header,  
+        callback   	=> \&OilFox_getResponse,
+    });  
+    
+    return undef;
+}
+
+sub OilFox_getResponse($) {
+    
+    my ($param, $err, $data) = @_;
+    my $hash = $param->{hash};
+    my $name = $hash->{NAME};
+
+    if($err ne "") {
+        Log3 $name, 2, "error while requesting ".$param->{url}." - $err";     
+                                           
+    } elsif($data ne "") {
+        
+        if ($data eq '{"errorCode":401}') {
+            Log3 $name, 2, "Please register OilFox first";
+            $hash->{OilFox}->{oilfox_hwid} = "none";
+
+            OilFox_CONNECTED($hash,'connected');
+
+        } else {
+
+            Log3 $name, 5, "OilFox(s) found"; 			
+            Log3 $name, 5, $data; 
+            
+            my $result = eval { decode_json($data) };
+            if ($@) {
+                Log3( $name, 2, " - JSON error while request: $@");
+                return;
+            }	
+                    
+            my $oilfox = $hash->{OilFox}->{oilfox};
+            Log3 $name, 5, $result->{'devices'}->[$oilfox]->{'name'};
+            
+            my $myoilfox = $result->{'devices'}->[$oilfox];
+            $hash->{OilFox}->{oilfox_name} = $myoilfox->{'name'};
+            $hash->{OilFox}->{oilfox_hwid} = $myoilfox->{'hwid'};
+            $hash->{OilFox}->{oilfox_tankVolume} = $myoilfox->{'tankVolume'};
+            $hash->{OilFox}->{oilfox_metering_value} = $myoilfox->{'metering'}->{'value'};
+            $hash->{OilFox}->{oilfox_metering_fillingPercentage} = $myoilfox->{'metering'}->{'fillingPercentage'};
+            $hash->{OilFox}->{oilfox_metering_liters} = $myoilfox->{'metering'}->{'liters'};
+            $hash->{OilFox}->{oilfox_metering_currentOilHeight} = $myoilfox->{'metering'}->{'currentOilHeight'};
+            $hash->{OilFox}->{oilfox_metering_battery} = $myoilfox->{'metering'}->{'battery'};
+       
+            OilFox_CONNECTED($hash,'connected');
+
+        }
+        
+        readingsBeginUpdate($hash);
+        readingsBulkUpdate($hash, "oilfox_name", $hash->{OilFox}->{oilfox_name});    
+        readingsBulkUpdate($hash, "oilfox_hwid", $hash->{OilFox}->{oilfox_hwid});    
+        readingsBulkUpdate($hash, "oilfox_tankVolume", $hash->{OilFox}->{oilfox_tankVolume});   
+        readingsBulkUpdate($hash, "oilfox_metering_value", $hash->{OilFox}->{oilfox_metering_value});   
+        readingsBulkUpdate($hash, "oilfox_metering_fillingPercentage", $hash->{OilFox}->{oilfox_metering_fillingPercentage});   
+        readingsBulkUpdate($hash, "oilfox_metering_liters", $hash->{OilFox}->{oilfox_metering_liters});
+        readingsBulkUpdate($hash, "oilfox_metering_currentOilHeight", $hash->{OilFox}->{oilfox_metering_currentOilHeight});   
+        readingsBulkUpdate($hash, "oilfox_metering_battery", $hash->{OilFox}->{oilfox_metering_battery});
+        readingsEndUpdate($hash, 1);
+         
+    }	
+    
+    return undef;
+
+}
+
+1;
+
+=pod
+=item device
+=item summary    support for OilFox
+=begin html
+
+<a name="OilFox"></a>
+<h3>OilFox</h3>
+<ul>
+	<u><b>Requirements</b></u>
+  	<br><br>
+	<ul>
+		<li>This module allows the communication between the Oilfox Cloud and FHEM.</li>
+  	</ul>
+	<br>
+	
+	<a name="OilFoxDefine"></a>
+	<b>Define</b>
+	<ul>
+		<code>define &lt;name&gt; OilFox</code>
+		<br><br>
+		Example:
+		<ul><br>
+			<code>define myOilFox OilFox<br>
+			attr myOilFox email YOUR_EMAIL<br>
+			attr myOilFox password YOUR_PASSWORD
+			</code><br>
+		</ul>
+		<br><br>
+		You must set both attributes <b>email</b> and <b>password</b>. These are the same that you use to login via the OilFox App.
+	</ul>
+	<br>
+	
+
+	<a name="OilFoxAttributes"></a>
+	<b>Attributes</b>
+	<ul>
+		<li>username - Email that is used in OilFox App</li>
+		<li>password - Password that is used in OilFox App</li>
+	</ul>
+	<br>
+	
+	<b>Optional attributes</b>
+	<ul>
+		<li>oilfox - ID of OilFox, if more that one is registered. Default: 0</li>
+		<li>interval - Time in seconds that is used to get new data from OilFox Cloud. Default: 300</li>
+	</ul>
+	<br>
+	
+	<a name="OilFoxReadings"></a>
+	<b>Readings</b>
+	<ul>
+		<li>expires - date when session of OilFox Cloud expires</li>
+		<li>battery - Battery power in percent</li>
+		<li>ooilfox_hwid - Id of the OilFox</li>
+        <li>oilfox_name - Name of the OilFox</li>
+        <li>oilfox_tankVolume - Tank Volume in liters</li>
+		<li>oilfox_metering_battery - Battery in percent</li>
+		<li>oilfox_metering_value - Tank Value</li>
+		<li>oilfox_metering_fillingPercentage - Tank filling Percentage</li>
+		<li>oilfox_metering_liters - Tank filling liters</li>
+        <li>oilfox_metering_currentOilHeight - Tank current Oil Height</li>
+	</ul>
+</ul>
+
+=end html