diff --git a/.gitignore b/.gitignore
index 1bbf276..a45e573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,3 +163,27 @@
 /Utils/IoT/Connector/Data/Mosquitto/bin/Debug
 /Utils/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.pdb
 /Utils/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.pdb
+/BosmonMqtt
+/House-Dashboard/.vs/House-Dashboard/v15
+/House-Dashboard/House-Dashboard/bin/Debug
+/House-Dashboard/House-Dashboard/bin/Sample
+/House-Dashboard/House-Dashboard/obj/Debug
+/Zway/packages/LitJson.0.9.0
+*.pdb
+/Utils/IoT/Connector/Data/Mqtt/.vs/ConnectorDataMqtt/v15
+/Librarys/litjson/.vs/litjson/v15
+/Librarys/litjson/litjson/bin/Debug
+/Librarys/litjson/litjson/obj
+/Librarys/mqtt/.vs/M2Mqtt/v15
+/Librarys/mqtt/M2Mqtt/.vs/M2Mqtt/v15
+/Librarys/mqtt/M2Mqtt/bin/Debug
+/Librarys/mqtt/M2Mqtt/obj
+/Hue-Bot/.vs
+/Hue-Bot/Hue-Bot/bin/Debug
+/Hue-Bot/Hue-Bot/obj
+/Hue/.vs/Hue/v15
+/Hue/Hue/bin/Debug
+/Hue/Hue/obj
+/Hue-Bot/Hue-Bot/bin/mqtt.ini
+/Hue-Bot/Hue-Bot/bin/settings.ini
+/House-Dashboard/packages
diff --git a/House-Dashboard/House-Dashboard.sln b/House-Dashboard/House-Dashboard.sln
new file mode 100644
index 0000000..b36a61b
--- /dev/null
+++ b/House-Dashboard/House-Dashboard.sln
@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "House-Dashboard", "House-Dashboard\House-Dashboard.csproj", "{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils\IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {85D9EA74-4174-4FF9-A623-EB89DE84C01D}
+	EndGlobalSection
+EndGlobal
diff --git a/House-Dashboard/House-Dashboard/App.config b/House-Dashboard/House-Dashboard/App.config
new file mode 100644
index 0000000..8fc0551
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+    </startup>
+</configuration>
diff --git a/House-Dashboard/House-Dashboard/App.xaml b/House-Dashboard/House-Dashboard/App.xaml
new file mode 100644
index 0000000..5d1ddfd
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="House_Dashboard.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:House_Dashboard"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/House-Dashboard/House-Dashboard/App.xaml.cs b/House-Dashboard/House-Dashboard/App.xaml.cs
new file mode 100644
index 0000000..3d94e33
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/App.xaml.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace House_Dashboard {
+  /// <summary>
+  /// Interaktionslogik für "App.xaml"
+  /// </summary>
+  public partial class App : Application {
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Functions/Tabs.cs b/House-Dashboard/House-Dashboard/Functions/Tabs.cs
new file mode 100644
index 0000000..ee7dded
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Functions/Tabs.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Net.Cache;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using BlubbFish.House.Dashboard.Graphics;
+using BlubbFish.Utils;
+using BlubbFish.Utils.IoT.Connector;
+
+namespace BlubbFish.House.Dashboard.Functions {
+  class Tabs {
+    private InIReader ini;
+    private ADataBackend data;
+    private TabItem tab;
+
+    public Tabs(InIReader settings, ADataBackend data) {
+      this.ini = settings;
+      this.data = data;
+    }
+
+    internal TabItem GetTab() {
+      this.tab = new TabItem();
+      this.GenerateHeader();
+      this.GenerateContent();
+      return this.tab;
+    }
+
+    private void GenerateContent() {
+      Grid g = new Grid {
+        Background = new BrushConverter().ConvertFromString("#FFE5E5E5") as SolidColorBrush
+      };
+      if (this.ini.GetValue("general", "background-image") != null) {
+        BitmapImage bitmap = new BitmapImage();
+        bitmap.BeginInit();
+        bitmap.CacheOption = BitmapCacheOption.None;
+        bitmap.UriCachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache);
+        bitmap.CacheOption = BitmapCacheOption.OnLoad;
+        bitmap.CreateOptions = BitmapCreateOptions.IgnoreImageCache;
+        bitmap.UriSource = new Uri(this.ini.GetValue("general", "background-image"), UriKind.RelativeOrAbsolute);
+        bitmap.EndInit();
+        Image bgimage = new Image {
+          Source = bitmap
+        };
+        g.Children.Add(bgimage);
+      }
+      foreach (String item in this.ini.GetSections(false)) {
+        if(item != "general") {
+          AGraphics a = AGraphics.GetInstance(this.ini.GetSection(item), this.data);
+          if (a != null) {
+            g.Children.Add(a.Draw());
+          }
+        }
+      }
+      this.tab.Content = g;
+    }
+
+    private void GenerateHeader() {
+      StackPanel header = new StackPanel {
+        Orientation = Orientation.Horizontal
+      };
+      if (this.ini.GetValue("general", "icon") != null) {
+        BitmapImage bitmap = new BitmapImage();
+        bitmap.BeginInit();
+        bitmap.CacheOption = BitmapCacheOption.None;
+        bitmap.UriCachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache);
+        bitmap.CacheOption = BitmapCacheOption.OnLoad;
+        bitmap.CreateOptions = BitmapCreateOptions.IgnoreImageCache;
+        bitmap.UriSource = new Uri(this.ini.GetValue("general", "icon"), UriKind.RelativeOrAbsolute);
+        bitmap.EndInit();
+        Image image = new Image {
+          Source = bitmap
+        };
+        header.Children.Add(image);
+      }
+      if (this.ini.GetValue("general", "name") != null) {
+        TextBlock t = new TextBlock {
+          Text = this.ini.GetValue("general", "name"),
+          FontSize = 20
+        };
+        header.Children.Add(t);
+      }
+      this.tab.Header = header;
+    }
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Functions/Workload.cs b/House-Dashboard/House-Dashboard/Functions/Workload.cs
new file mode 100644
index 0000000..2dd24bc
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Functions/Workload.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BlubbFish.Utils.IoT.Connector;
+
+namespace BlubbFish.House.Dashboard.Functions {
+  class Workload {
+    private SortedDictionary<DateTime, MqttEventArgs> list = new SortedDictionary<DateTime, MqttEventArgs>();
+
+    public delegate void WorkloadEvent(Object sender, EventArgs e);
+    public event WorkloadEvent Update;
+
+    public Int32 Maximum { get; private set; }
+    public Int32 Now { get; private set; }
+
+    internal void SetMessage(MqttEventArgs e) {
+      DateTime d = DateTime.Now;
+      if (this.list.ContainsKey(d)) {
+        return;
+      }
+      this.list.Add(d, e);
+      DateTime old = DateTime.Now.AddSeconds(-30);
+      List<DateTime> remove = new List<DateTime>();
+      foreach (KeyValuePair<DateTime, MqttEventArgs> item in this.list) {
+        if(item.Key < old) {
+          remove.Add(item.Key);
+        }
+      }
+      foreach (DateTime item in remove) {
+        this.list.Remove(item);
+      }
+      if(this.list.Count > this.Maximum) {
+        this.Maximum = this.list.Count;
+      }
+      this.Now = this.list.Count;
+      this.Update?.Invoke(this, null);
+    }
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Graphics/AGraphics.cs b/House-Dashboard/House-Dashboard/Graphics/AGraphics.cs
new file mode 100644
index 0000000..0fc429c
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Graphics/AGraphics.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using BlubbFish.Utils.IoT.Connector;
+
+namespace BlubbFish.House.Dashboard.Graphics {
+  abstract class AGraphics {
+    protected ADataBackend data;
+    protected Dictionary<String, String> settings;
+
+    protected AGraphics(Dictionary<String, String> settings, ADataBackend data) {
+      this.data = data;
+      this.settings = settings;
+    }
+
+    internal static AGraphics GetInstance(Dictionary<String, String> settings, ADataBackend data) {
+      if(!settings.ContainsKey("graphic")) {
+        return null;
+      }
+      String object_sensor = "BlubbFish.House.Dashboard.Graphics." + settings["graphic"].ToUpperLower();
+      Type t = null;
+      try {
+        t = Type.GetType(object_sensor, true);
+      } catch (TypeLoadException) {
+        throw new ArgumentException("tracings.ini: " + settings["graphic"].ToUpperLower() + " is not a Tracing");
+      }
+      return (AGraphics)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(ADataBackend) }).Invoke(new Object[] { settings, data });
+    }
+
+    public abstract Grid Draw();
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Graphics/Heater.cs b/House-Dashboard/House-Dashboard/Graphics/Heater.cs
new file mode 100644
index 0000000..40ae2fb
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Graphics/Heater.cs
@@ -0,0 +1,206 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using BlubbFish.Utils.IoT.Connector;
+using LitJson;
+
+namespace BlubbFish.House.Dashboard.Graphics {
+  class Heater : AGraphics {
+    private TextBlock targetTemp;
+    private Dictionary<Int32, Double> targetTemps = new Dictionary<Int32, Double>();
+    private TextBlock mode;
+    private TextBlock now;
+    private String topic;
+    private Dictionary<Int32, String> modes = new Dictionary<Int32, String>();
+    private Int32 activemode = -1;
+    private Dictionary<String, String> replace = new Dictionary<String, String> {
+      { "Heat", "Heizen" },
+      { "Energy Save Heat", "Nacht" }
+    };
+
+    public Heater(Dictionary<String, String> settings, ADataBackend data) : base(settings, data) {
+      this.targetTemp = new TextBlock {
+        Text = "0 °C"
+      };
+      this.mode = new TextBlock {
+        Text = "Mode"
+      };
+      this.now = new TextBlock {
+        Text = "0 °C"
+      };
+      if(this.settings.ContainsKey("topic")) {
+        this.topic = this.settings["topic"];
+        this.data.MessageIncomming += this.Data_MessageIncomming;
+        this.data.Send(this.topic + "/0/49/1/get", "");
+        this.data.Send(this.topic + "/0/64/get", "");
+        this.data.Send(this.topic + "/0/67/1/get", "");
+        this.data.Send(this.topic + "/0/67/11/get", "");
+      }
+    }
+
+    private void Data_MessageIncomming(Object sender, MqttEventArgs e) {
+      if (e.Topic.StartsWith(this.topic)) {
+        try {
+          JsonData j = JsonMapper.ToObject(e.Message);
+          if (e.Topic == this.topic + "/0/49/1") {
+            if (j.Keys.Contains("Level")) {
+              if (Double.TryParse(j["Level"].ToString(), out Double level)) {
+                this.now.Dispatcher.BeginInvoke((Action)(() => {
+                  this.now.Text = level.ToString() + " °C";
+                }));
+              }
+            }
+          }
+          if (e.Topic == this.topic + "/0/64") {
+            if (j.Keys.Contains("ValidModes") && j["ValidModes"].IsObject && this.modes.Count == 0) {
+              foreach (String item in j["ValidModes"].Keys) {
+                if (Int32.TryParse(item, out Int32 jvmode)) {
+                  this.modes.Add(jvmode, j["ValidModes"][item].ToString());
+                }
+              }
+            }
+            if (j.Keys.Contains("Level")) {
+              if (Int32.TryParse(j["Level"].ToString(), out Int32 jmode) && this.modes.ContainsKey(jmode)) {
+                this.activemode = jmode;
+                String text = this.modes[jmode];
+                if (this.replace.ContainsKey(text)) {
+                  text = this.replace[text];
+                }
+                this.now.Dispatcher.BeginInvoke((Action)(() => {
+                  this.mode.Text = text;
+                }));
+                this.WriteTargetTemp();
+              }
+            }
+          }
+          if (e.Topic == this.topic + "/0/67/1" || e.Topic == this.topic + "/0/67/11") {
+            if (j.Keys.Contains("Level")) {
+              if (Double.TryParse(j["Level"].ToString(), out Double temp)) {
+                Int32 id = 0;
+                if (e.Topic.EndsWith("/1")) {
+                  id = 1;
+                } else if (e.Topic.EndsWith("/11")) {
+                  id = 11;
+                }
+                if (this.targetTemps.ContainsKey(id)) {
+                  this.targetTemps[id] = temp;
+                } else {
+                  this.targetTemps.Add(id, temp);
+                }
+                this.WriteTargetTemp();
+              }
+            }
+          }
+        } catch (Exception) { }
+      }
+    }
+
+    private void WriteTargetTemp() {
+      if (this.targetTemps.ContainsKey(this.activemode)) {
+        this.now.Dispatcher.BeginInvoke((Action)(() => {
+          this.targetTemp.Text = this.targetTemps[this.activemode] + " °C";
+        }));
+      }
+    }
+
+    public override Grid Draw() {
+      Grid outergrid = this.CreateOuterGrid();
+      outergrid.Children.Add(this.CreateInnerGrid());
+      outergrid.Children.Add(this.CreateTextBlock());
+      return outergrid;
+    }
+
+    private TextBlock CreateTextBlock() {
+      //<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="0 °C"  Grid.Column="1" FontWeight="Bold" FontSize="28" Margin="5,0,10,0"/>
+      this.now.HorizontalAlignment = HorizontalAlignment.Left;
+      this.now.VerticalAlignment = VerticalAlignment.Top;
+      
+      this.now.SetValue(Grid.ColumnProperty, 1);
+      this.now.FontWeight = FontWeights.Bold;
+      this.now.FontSize = 28;
+      this.now.Margin = new Thickness(5,0,10,0);
+      return this.now;
+    }
+
+    private Grid CreateInnerGrid() {
+      //<Grid Height="45" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,0,0,0">
+      // <Grid.RowDefinitions>
+      //  <RowDefinition Height="22"/>
+      //  <RowDefinition/>
+      // </Grid.RowDefinitions>
+      // <TextBlock HorizontalAlignment="Center" VerticalAlignment="Top" Text="0 °C" FontSize="18"/>
+      // <TextBlock HorizontalAlignment="Center" VerticalAlignment="Top" Text="Mode" Grid.Row="1" FontSize="12"/>
+      //</Grid>
+      Grid grid = new Grid {
+        Height = 45,
+        HorizontalAlignment = HorizontalAlignment.Left,
+        VerticalAlignment = VerticalAlignment.Top,
+        Margin = new Thickness(10, 0, 0, 0)
+      };
+
+      grid.RowDefinitions.Add(new RowDefinition {
+        Height = new GridLength(22)
+      });
+      grid.RowDefinitions.Add(new RowDefinition());
+      this.targetTemp.HorizontalAlignment = HorizontalAlignment.Center;
+      this.targetTemp.VerticalAlignment = VerticalAlignment.Top;
+      this.targetTemp.FontSize = 18;
+      grid.Children.Add(this.targetTemp);
+      this.mode.HorizontalAlignment = HorizontalAlignment.Center;
+      this.mode.VerticalAlignment = VerticalAlignment.Top;
+      this.mode.SetValue(Grid.RowProperty, 1);
+      this.mode.FontSize = 12;
+      grid.Children.Add(this.mode);
+      return grid;
+    }
+
+    private Grid CreateOuterGrid() {
+      //<Grid HorizontalAlignment="Left" Margin="x,y,0,0" VerticalAlignment="Top">
+      // <Grid.RenderTransform>
+      //  <TransformGroup>
+      //   <ScaleTransform/>
+      //   <SkewTransform/>
+      //   <RotateTransform Angle="0"/>
+      //   <TranslateTransform/>
+      //  </TransformGroup>
+      // </Grid.RenderTransform>
+      // <Grid.Background>
+      //  <ImageBrush ImageSource = "pack://siteoforigin:,,,/Resources/graphics_heater.png" />
+      // </Grid.Background>
+      // <Grid.ColumnDefinitions>
+      //  <ColumnDefinition/>
+      //  <ColumnDefinition/>
+      // </Grid.ColumnDefinitions>
+      //</Grid>
+      Double rotate = 0;
+      if (this.settings.ContainsKey("rotate") && Double.TryParse(this.settings["rotate"], out rotate)) { }
+      Grid grid = new Grid {
+        HorizontalAlignment = HorizontalAlignment.Left,
+        VerticalAlignment = VerticalAlignment.Top,
+        Background = new ImageBrush(Helper.BitmapToImageSource(Properties.Resources.graphics_heater)),
+        RenderTransform = new RotateTransform(rotate)
+      };
+      Thickness thickness = new Thickness();
+      Boolean thicknessSet = false;
+      if (this.settings.ContainsKey("x") && Int32.TryParse(this.settings["x"], out Int32 x)) {
+        thickness.Left = x;
+        thicknessSet = true;
+      }
+      if (this.settings.ContainsKey("y") && Int32.TryParse(this.settings["y"], out Int32 y)) {
+        thickness.Top = y;
+        thicknessSet = true;
+      }
+      if (thicknessSet) {
+        grid.Margin = thickness;
+      }
+      grid.ColumnDefinitions.Add(new ColumnDefinition());
+      grid.ColumnDefinitions.Add(new ColumnDefinition());
+      return grid;
+    }
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Helper.cs b/House-Dashboard/House-Dashboard/Helper.cs
new file mode 100644
index 0000000..ff22335
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Helper.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace BlubbFish.House.Dashboard {
+  static class Helper {
+    internal static String ToUpperLower(this String s) {
+      if (s.Length == 0) {
+        return "";
+      }
+      if (s.Length == 1) {
+        return s.ToUpper();
+      }
+      return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
+    }
+    internal static BitmapImage BitmapToImageSource(Bitmap bitmap) {
+      using (MemoryStream memory = new MemoryStream()) {
+        bitmap.Save(memory, System.Drawing.Imaging.ImageFormat.Png);
+        memory.Position = 0;
+        BitmapImage bitmapimage = new BitmapImage();
+        bitmapimage.BeginInit();
+        bitmapimage.StreamSource = memory;
+        bitmapimage.CacheOption = BitmapCacheOption.OnLoad;
+        bitmapimage.EndInit();
+
+        return bitmapimage;
+      }
+    }
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/House-Dashboard.csproj b/House-Dashboard/House-Dashboard/House-Dashboard.csproj
new file mode 100644
index 0000000..ed77177
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/House-Dashboard.csproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D1D4B67E-7BEB-4EDB-9D40-E29F0BE078C4}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>BlubbFish.House.Dashboard</RootNamespace>
+    <AssemblyName>Dashboard</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Functions\Tabs.cs" />
+    <Compile Include="Functions\Workload.cs" />
+    <Compile Include="Graphics\AGraphics.cs" />
+    <Compile Include="Graphics\Heater.cs" />
+    <Compile Include="Helper.cs" />
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj">
+      <Project>{ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2}</Project>
+      <Name>ConnectorDataMqtt</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\IoT\Utils-IoT.csproj">
+      <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
+      <Name>Utils-IoT</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
+      <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
+      <Name>Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\graphics_heater.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/House-Dashboard/House-Dashboard/MainWindow.xaml b/House-Dashboard/House-Dashboard/MainWindow.xaml
new file mode 100644
index 0000000..ee37d8e
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/MainWindow.xaml
@@ -0,0 +1,87 @@
+<Window x:Class="House_Dashboard.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:House_Dashboard"
+        mc:Ignorable="d"
+        Title="Dashboard" WindowState="Maximized" Topmost="True" WindowStyle="None" Height="600" Width="800" Name="myWindow">
+    <Grid>
+        <TabControl x:Name="tabs" Padding="0" Margin="0,0,0,26">
+            <TabItem Header="Home" FontSize="20">
+                <Grid Background="#FFE5E5E5">
+                    <Image Source="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\bin\Debug\Images\Grundriss.png"/>
+                    <Grid HorizontalAlignment="Left" Margin="105,87,0,0" VerticalAlignment="Top">
+                        <Grid.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Grid.RenderTransform>
+                        <Grid.Background>
+                            <ImageBrush ImageSource="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\graphics_heater.png"/>
+                        </Grid.Background>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Grid Height="45" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="22"/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <TextBlock HorizontalAlignment="Center" Text="0 °C" VerticalAlignment="Top" FontSize="18"/>
+                            <TextBlock HorizontalAlignment="Center" Text="Mode" VerticalAlignment="Top" Grid.Row="1" FontSize="12"/>
+                        </Grid>
+                        <TextBlock HorizontalAlignment="Left" Text="99 °C" VerticalAlignment="Top" Grid.Column="1" FontWeight="Bold" FontSize="28" Margin="5,0,10,0"/>
+                    </Grid>
+
+                </Grid>
+            </TabItem>
+        </TabControl>
+        <StatusBar Margin="0" VerticalAlignment="Bottom" Height="26">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Text="Verbunden:" FontWeight="Bold" HorizontalAlignment="Left"/>
+            </StatusBarItem>
+            <StatusBarItem>
+                <TextBlock x:Name="statusConnection" Text="Nein" Foreground="Red" Margin="71,0,0,0" HorizontalAlignment="Left"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Text="Auslastung:" FontWeight="Bold" HorizontalAlignment="Left"/>
+            </StatusBarItem>
+            <StatusBarItem Grid.Column="2">
+                <ProgressBar x:Name="statusLoadBar" Height="10" Width="100" HorizontalAlignment="Left" Margin="72,0,0,0"/>
+            </StatusBarItem>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock x:Name="statusLoadValue" Text="0 M/30s (00:00:00)" HorizontalAlignment="Left" Margin="178,0,0,0"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Right">
+                <Button Content="Beenden" Click="ApplicationShutdown"/>
+            </StatusBarItem>
+        </StatusBar>
+        <Popup PlacementTarget="{Binding ElementName=myWindow}" Placement="Center" PopupAnimation="Slide" IsOpen="True">
+            <Grid Background="White">
+                <Border BorderBrush="Black" BorderThickness="1"/>
+                <TextBlock Text="asdasdasd"/>
+                
+            </Grid>
+        </Popup>
+    </Grid>
+</Window>
diff --git a/House-Dashboard/House-Dashboard/MainWindow.xaml.cs b/House-Dashboard/House-Dashboard/MainWindow.xaml.cs
new file mode 100644
index 0000000..898bdb7
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/MainWindow.xaml.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using BlubbFish.House.Dashboard.Functions;
+using BlubbFish.Utils;
+using BlubbFish.Utils.IoT.Connector;
+
+namespace House_Dashboard {
+  /// <summary>
+  /// Interaktionslogik für MainWindow.xaml
+  /// </summary>
+  public partial class MainWindow : Window {
+    private ADataBackend mqtt;
+    private Workload workload;
+
+    public MainWindow() {
+      CultureInfo info = new CultureInfo("de-DE");
+      info.NumberFormat.NumberDecimalSeparator = ".";
+      CultureInfo.DefaultThreadCurrentCulture = info;
+      CultureInfo.DefaultThreadCurrentUICulture = info;
+      System.Threading.Thread.CurrentThread.CurrentCulture = info;
+      System.Threading.Thread.CurrentThread.CurrentUICulture = info;
+      LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(System.Windows.Markup.XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
+
+      InitializeComponent();
+      InitMqtt();
+      InitTabs();
+    }
+
+    private void InitTabs() {
+      if(File.Exists("tabs.ini")) {
+        foreach (String item in InIReader.GetInstance("tabs.ini").GetSections()) {
+          if(InIReader.GetInstance("tabs.ini").GetValue(item, "settings") != null && File.Exists(InIReader.GetInstance("tabs.ini").GetValue(item, "settings"))) {
+            this.tabs.Items.Add(new Tabs(InIReader.GetInstance(InIReader.GetInstance("tabs.ini").GetValue(item, "settings")), this.mqtt).GetTab());
+          }
+        }
+      } else {
+        MessageBox.Show("tabs.ini nicht gefunden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+        this.ApplicationShutdown(null, null);
+      }
+    }
+
+    private void InitMqtt() {
+      if(File.Exists("mqtt.ini")) {
+        this.mqtt = ADataBackend.GetInstance(InIReader.GetInstance("mqtt.ini").GetSection("settings"));
+        if(this.mqtt == null) {
+          MessageBox.Show("Der Mqtt Treiber konnte nicht geladen werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+          this.ApplicationShutdown(null, null);
+        }
+        this.Dispatcher.BeginInvoke((Action)(() => {
+          this.statusConnection.Text = "Ja";
+          this.statusConnection.Foreground = Brushes.Green;
+        }));
+        this.mqtt.MessageIncomming += this.IncommingData;
+        this.workload = new Workload();
+        this.workload.Update += this.UpdateWorkload;
+      } else {
+        MessageBox.Show("mqtt.ini nicht gefunden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+        this.ApplicationShutdown(null, null);
+      }
+    }
+
+    private void IncommingData(Object sender, MqttEventArgs e) {
+      this.workload.SetMessage(e);
+    }
+
+    private void UpdateWorkload(Object sender, EventArgs e) {
+      Workload w = (Workload)sender;
+      this.Dispatcher.BeginInvoke((Action)(() => {
+        this.statusLoadBar.Maximum = w.Maximum;
+        this.statusLoadBar.Value = w.Now;
+        this.statusLoadValue.Text = w.Now + " M/30s (" + DateTime.Now.ToLocalTime() + ")";
+      }));
+    }
+
+    private void ApplicationShutdown(Object sender, RoutedEventArgs e) {
+      if(this.mqtt != null) {
+        this.mqtt.Dispose();
+      }
+      Application.Current.Shutdown();
+    }
+  }
+}
diff --git a/House-Dashboard/House-Dashboard/Properties/AssemblyInfo.cs b/House-Dashboard/House-Dashboard/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..d2f7150
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Properties/AssemblyInfo.cs
@@ -0,0 +1,57 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("Dashboard")]
+[assembly: AssemblyDescription("House Dashboard")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("BlubbFish")]
+[assembly: AssemblyProduct("Dashboard")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 01.01.2018")]
+[assembly: AssemblyTrademark("BlubbFish")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+//Um mit dem Erstellen lokalisierbarer Anwendungen zu beginnen, legen Sie
+//<UICulture>ImCodeVerwendeteKultur</UICulture> in der .csproj-Datei
+//in einer <PropertyGroup> fest.  Wenn Sie in den Quelldateien beispielsweise Deutsch
+//(Deutschland) verwenden, legen Sie <UICulture> auf \"de-DE\" fest.  Heben Sie dann die Auskommentierung
+//des nachstehenden NeutralResourceLanguage-Attributs auf.  Aktualisieren Sie "en-US" in der nachstehenden Zeile,
+//sodass es mit der UICulture-Einstellung in der Projektdatei übereinstimmt.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher
+                                     //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
+                                     // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.)
+    ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs
+                                              //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
+                                              // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.)
+)]
+
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// übernehmen, indem Sie "*" eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("de-DE")]
+
diff --git a/House-Dashboard/House-Dashboard/Properties/Resources.Designer.cs b/House-Dashboard/House-Dashboard/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..8524132
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace BlubbFish.House.Dashboard.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BlubbFish.House.Dashboard.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap graphics_heater {
+            get {
+                object obj = ResourceManager.GetObject("graphics_heater", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/House-Dashboard/House-Dashboard/Properties/Resources.resx b/House-Dashboard/House-Dashboard/Properties/Resources.resx
new file mode 100644
index 0000000..0deabe2
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="graphics_heater" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\graphics_heater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/House-Dashboard/House-Dashboard/Properties/Settings.Designer.cs b/House-Dashboard/House-Dashboard/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..e3957c1
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace BlubbFish.House.Dashboard.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/House-Dashboard/House-Dashboard/Properties/Settings.settings b/House-Dashboard/House-Dashboard/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/House-Dashboard/House-Dashboard/Resources/graphics_heater.png b/House-Dashboard/House-Dashboard/Resources/graphics_heater.png
new file mode 100644
index 0000000..84b4dc4
Binary files /dev/null and b/House-Dashboard/House-Dashboard/Resources/graphics_heater.png differ
diff --git a/House-Dashboard/House-Dashboard/packages.config b/House-Dashboard/House-Dashboard/packages.config
new file mode 100644
index 0000000..302ea4e
--- /dev/null
+++ b/House-Dashboard/House-Dashboard/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LitJson" version="0.9.0" targetFramework="net471" />
+</packages>
\ No newline at end of file
diff --git a/Hue-Bot/Hue-Bot.sln b/Hue-Bot/Hue-Bot.sln
new file mode 100644
index 0000000..bfeaba2
--- /dev/null
+++ b/Hue-Bot/Hue-Bot.sln
@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hue-Bot", "Hue-Bot\Hue-Bot.csproj", "{4C2F9593-4CF6-47DC-85D3-2D098C404C70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hue", "..\Hue\Hue\Hue.csproj", "{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils\IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4C2F9593-4CF6-47DC-85D3-2D098C404C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C2F9593-4CF6-47DC-85D3-2D098C404C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C2F9593-4CF6-47DC-85D3-2D098C404C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C2F9593-4CF6-47DC-85D3-2D098C404C70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {15702E91-23B8-44F6-9544-A0C8E506A91E}
+	EndGlobalSection
+EndGlobal
diff --git a/Hue-Bot/Hue-Bot/Hue-Bot.csproj b/Hue-Bot/Hue-Bot/Hue-Bot.csproj
new file mode 100644
index 0000000..edc6956
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Hue-Bot.csproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4C2F9593-4CF6-47DC-85D3-2D098C404C70}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BlubbFish.IoT.Bot.HueBot</RootNamespace>
+    <AssemblyName>Hue-Bot</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="lib\Events.cs" />
+    <Compile Include="lib\Helper.cs" />
+    <Compile Include="Interfaces\AModul.cs" />
+    <Compile Include="Moduls\Mqtt.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Hue\Hue\Hue.csproj">
+      <Project>{738a6137-8fca-4ce1-bd1c-042b21b6b5f2}</Project>
+      <Name>Hue</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
+      <Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
+      <Name>litjson_4.7.1</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj">
+      <Project>{ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2}</Project>
+      <Name>ConnectorDataMqtt</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\IoT\Utils-IoT.csproj">
+      <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
+      <Name>Utils-IoT</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
+      <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
+      <Name>Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Hue-Bot/Hue-Bot/Hue-Bot.csproj.user b/Hue-Bot/Hue-Bot/Hue-Bot.csproj.user
new file mode 100644
index 0000000..c231409
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Hue-Bot.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>de-DE</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Hue-Bot/Hue-Bot/Interfaces/AModul.cs b/Hue-Bot/Hue-Bot/Interfaces/AModul.cs
new file mode 100644
index 0000000..45dd52e
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Interfaces/AModul.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Bot.HueBot.lib;
+using BlubbFish.IoT.Hue;
+using BlubbFish.Utils;
+
+namespace BlubbFish.IoT.Bot.HueBot.Interfaces {
+  abstract class AModul {
+    protected HueController hue;
+    private InIReader settings;
+    protected Dictionary<String, Dictionary<String, String>> config = new Dictionary<String, Dictionary<String, String>>();
+
+    public Boolean HasConfig { get; private set; }
+    public Boolean ConfigPublic { get; private set; }
+
+    public delegate void ModulEvent(Object sender, ModulEventArgs e);
+    public abstract event ModulEvent Update;
+
+    public AModul(HueController huec, InIReader settings) {
+      this.HasConfig = false;
+      this.ConfigPublic = false;
+      this.hue = huec;
+      this.settings = settings;
+      this.ParseConfig();
+    }
+
+    private void ParseConfig() {
+      if (this.settings != null) {
+        this.HasConfig = true;
+        foreach (String item in this.settings.GetSections(false)) {
+          this.config.Add(item, this.settings.GetSection(item));
+        }
+        if (this.config.ContainsKey("modul")) {
+          this.ConfigPublic = this.config["modul"].ContainsKey("config") && this.config["modul"]["config"].ToLower() == "public";
+        }
+      }
+    }
+
+    public Dictionary<String, Dictionary<String, String>> GetConfig() {
+      if (this.HasConfig && this.ConfigPublic) {
+        Dictionary<String, Dictionary<String, String>> ret = new Dictionary<String, Dictionary<String, String>>(this.config);
+        if (ret.ContainsKey("modul")) {
+          ret.Remove("modul");
+        }
+        return ret;
+      }
+      return new Dictionary<String, Dictionary<String, String>>();
+    }
+
+    public virtual void Interconnect(Dictionary<String, AModul> moduls) { }
+
+    public virtual void SetInterconnection(String param, Action<Object> hook, Object data) { }
+
+    public abstract void Dispose();
+
+    internal void SetConfig(Dictionary<String, Dictionary<String, String>> newconf) {
+      if (this.HasConfig && this.ConfigPublic) {
+        if (newconf.ContainsKey("modul")) {
+          newconf.Remove("modul");
+        }
+        if (this.config.ContainsKey("modul")) {
+          newconf.Add("modul", this.config["modul"]);
+        }
+        this.config = newconf;
+        this.settings.SetSections(this.config);
+        this.UpdateConfig();
+      }
+    }
+
+    protected abstract void UpdateConfig();
+  }
+}
diff --git a/Hue-Bot/Hue-Bot/Moduls/Mqtt.cs b/Hue-Bot/Hue-Bot/Moduls/Mqtt.cs
new file mode 100644
index 0000000..e8aff79
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Moduls/Mqtt.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Bot.HueBot.Interfaces;
+using BlubbFish.IoT.Bot.HueBot.lib;
+using BlubbFish.IoT.Hue;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.Utils;
+using BlubbFish.Utils.IoT.Connector;
+using LitJson;
+
+namespace BlubbFish.IoT.Bot.HueBot.Moduls {
+  class Mqtt : AModul, IDisposable {
+    private ADataBackend mqtt;
+    private Dictionary<String, AModul> modules;
+
+    public override event ModulEvent Update;
+
+    public Mqtt(HueController hue, InIReader settings) : base(hue, settings) {
+      if (this.config.ContainsKey("settings")) {
+        this.mqtt = ADataBackend.GetInstance(this.config["settings"]);
+        this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
+        this.hue.Update += this.ZwayEvent;
+      }
+    }
+
+    private void ZwayEvent(Object sender, AllUpdateEvent e) {
+      String topic = "";
+      String data = "";
+      if (e.Parent.GetType().HasInterface("IMqtt")) {
+        IMqtt sensor = (IMqtt)e.Parent;
+        topic = "/hue/" + sensor.MqttTopic();
+        data = sensor.ToJson();
+      }
+      if (topic != "" && data != "") {
+        this.mqtt.Send(topic, data);
+        this.Update?.Invoke(this, new MqttEvent(topic, data));
+      }
+    }
+
+    private void Mqtt_MessageIncomming(Object sender, MqttEventArgs e) {
+      if (e.Topic.StartsWith("/hue/") && (e.Topic.EndsWith("/set") || e.Topic.EndsWith("/get"))) {
+        //return "sensor/" + this.SensorId; (Int32)
+        //return "scene/" + this.SceneId; (String)
+        //return "light/" + this.LightId; (Int32)
+        //return "group/" + this.GroupId; (Int32)
+        //return "config";
+        Match m = new Regex("^/hue/(config)/[gs]et$|^/hue/(scene)/([^/]+)/[gs]et$|^/hue/(sensor|light|group)/(\\d+)/[gs]et$").Match(e.Topic);
+        String type = "";
+        String id = "";
+        if (m.Groups[1].Success) {
+          type = m.Groups[1].Value;
+        }
+        if (m.Groups[2].Success) {
+          type = m.Groups[2].Value;
+          id = m.Groups[3].Value;
+        }
+        if (m.Groups[4].Success) {
+          type = m.Groups[4].Value;
+          id = m.Groups[5].Value;
+        }
+        AConnector c = this.hue.GetConnector(type, id);
+        if (c == null) {
+          return;
+        }
+        if (e.Topic.EndsWith("/set")) {
+          try {
+            JsonData a = JsonMapper.ToObject(e.Message);
+            foreach (String item in a.Keys) {
+              String key = item.ToUpperLower();
+              if (c.HasProperty(key)) {
+                c.SetProperty(key, a[item].ToString());
+                this.Update?.Invoke(this, new MqttEvent(type + " " + id, a[item].ToString()));
+              }
+            }
+          } catch (Exception) { }
+        } else if (e.Topic.EndsWith("/get")) {
+          c.PollOnce = true;
+          this.mqtt.Send("/hue/" + ((IMqtt)c).MqttTopic(), ((IMqtt)c).ToJson());
+          this.Update?.Invoke(this, new MqttEvent(e.Topic, "Dataget"));
+        }
+      }
+      if (e.Topic.StartsWith("/huebot/config/") && (e.Topic.EndsWith("/set") || e.Topic.EndsWith("/get"))) {
+        Match m = new Regex("^/huebot/config/(\\w+)/[gs]et$|").Match(e.Topic);
+        if (!m.Groups[1].Success) {
+          return;
+        }
+        AModul modul = null;
+        foreach (KeyValuePair<String, AModul> item in this.modules) {
+          if (item.Key.ToLower() == m.Groups[1].Value) {
+            modul = item.Value;
+          }
+        }
+        if (modul == null) {
+          return;
+        }
+        if (e.Topic.EndsWith("/get") && modul.HasConfig && modul.ConfigPublic) {
+          String topic = "/huebot/config/" + m.Groups[1].Value;
+          String data = JsonMapper.ToJson(modul.GetConfig()).ToString();
+          this.mqtt.Send(topic, data);
+          this.Update?.Invoke(this, new MqttEvent(topic, data));
+        }
+        if (e.Topic.EndsWith("/set") && modul.HasConfig && modul.ConfigPublic) {
+          try {
+            JsonData a = JsonMapper.ToObject(e.Message);
+            Dictionary<String, Dictionary<String, String>> newconf = new Dictionary<String, Dictionary<String, String>>();
+            foreach (String section in a.Keys) {
+              Dictionary<String, String> sectiondata = new Dictionary<String, String>();
+              foreach (String item in a[section].Keys) {
+                sectiondata.Add(item, a[section][item].ToString());
+              }
+              newconf.Add(section, sectiondata);
+            }
+            modul.SetConfig(newconf);
+            this.Update?.Invoke(this, new MqttEvent("New Config", "Write"));
+          } catch (Exception) { }
+        }
+      }
+    }
+
+    public override void Interconnect(Dictionary<String, AModul> moduls) {
+      this.modules = moduls;
+    }
+
+    protected override void UpdateConfig() { }
+
+    #region IDisposable Support
+    private Boolean disposedValue = false;
+
+    protected virtual void Dispose(Boolean disposing) {
+      if (!this.disposedValue) {
+        if (disposing) {
+          this.mqtt.Dispose();
+        }
+        this.disposedValue = true;
+      }
+    }
+
+    ~Mqtt() {
+      Dispose(false);
+    }
+
+    public override void Dispose() {
+      Dispose(true);
+      GC.SuppressFinalize(this);
+    }
+    #endregion
+  }
+}
diff --git a/Hue-Bot/Hue-Bot/Program.cs b/Hue-Bot/Hue-Bot/Program.cs
new file mode 100644
index 0000000..a4841e0
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Program.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using BlubbFish.IoT.Bot.HueBot.Interfaces;
+using BlubbFish.IoT.Bot.HueBot.lib;
+using BlubbFish.IoT.Hue;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.Utils;
+
+namespace BlubbFish.IoT.Bot.HueBot {
+  class Program {
+    static void Main(String[] args) => new Program(args);
+
+    private HueController hue;
+    private Dictionary<String, AModul> moduls = new Dictionary<String, AModul>();
+    public Program(String[] args) {
+      if (!File.Exists("settings.ini")) {
+        Helper.WriteError("No settings.ini found. Abord!");
+        return;
+      }
+      this.hue = new HueController(InIReader.GetInstance("settings.ini").GetSection("hue"));
+      this.hue.Update += this.HueDataUpdate;
+      this.ModulLoader();
+      this.ModulInterconnect();
+      this.ModulEvents();
+      this.WaitForShutdown();
+      this.ModulDispose();
+    }
+
+    private void ModulLoader() {
+      Assembly asm = Assembly.GetExecutingAssembly();
+      foreach (Type item in asm.GetTypes()) {
+        if (item.Namespace == "BlubbFish.IoT.Bot.HueBot.Moduls") {
+          Type t = item;
+          String name = t.Name;
+          if (File.Exists(name.ToLower() + ".ini")) {
+            this.moduls.Add(name, (AModul)t.GetConstructor(new Type[] { typeof(HueController), typeof(InIReader) }).Invoke(new Object[] { this.hue, InIReader.GetInstance(name.ToLower() + ".ini") }));
+            Console.WriteLine("Load Modul " + name);
+          } else if (t.HasInterface("IForceLoad")) {
+            this.moduls.Add(name, (AModul)t.GetConstructor(new Type[] { typeof(HueController), typeof(InIReader) }).Invoke(new Object[] { this.hue, null }));
+            Console.WriteLine("Load Modul Forced " + name);
+          }
+        }
+      }
+    }
+
+    private void ModulInterconnect() {
+      foreach (KeyValuePair<String, AModul> item in this.moduls) {
+        item.Value.Interconnect(this.moduls);
+      }
+    }
+
+    private void ModulEvents() {
+      foreach (KeyValuePair<String, AModul> item in this.moduls) {
+        item.Value.Update += this.ModulUpdate;
+      }
+    }
+
+    private void WaitForShutdown() {
+      while (true) {
+        System.Threading.Thread.Sleep(100);
+        if (Console.KeyAvailable) {
+          ConsoleKeyInfo key = Console.ReadKey(false);
+          if (key.Key == ConsoleKey.Escape) {
+            break;
+          }
+        }
+      }
+    }
+
+    private void ModulDispose() {
+      foreach (KeyValuePair<String, AModul> item in this.moduls) {
+        item.Value.Dispose();
+        Console.WriteLine("Modul entladen: " + item.Key);
+      }
+      this.hue.Dispose();
+    }
+
+    private void HueDataUpdate(Object sender, AllUpdateEvent e) {
+      Console.WriteLine("-> Hue [" + e.UpdateTime + "]: " + e.Parent.ToString());
+    }
+
+    private void ModulUpdate(Object sender, ModulEventArgs e) {
+      Console.WriteLine(e.ToString());
+    }
+  }
+}
diff --git a/Hue-Bot/Hue-Bot/Properties/AssemblyInfo.cs b/Hue-Bot/Hue-Bot/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..58bd81b
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Properties/AssemblyInfo.cs
@@ -0,0 +1,39 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("Hue-Bot")]
+[assembly: AssemblyDescription("Is a Bot for Hue Devices")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("BlubbFish")]
+[assembly: AssemblyProduct("Hue-Bot")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 15.04.2018")]
+[assembly: AssemblyTrademark("BlubbFish")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("4c2f9593-4cf6-47dc-85d3-2d098c404c70")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// übernehmen, indem Sie "*" eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("de-DE")]
+
diff --git a/Hue-Bot/Hue-Bot/Properties/Resources.Designer.cs b/Hue-Bot/Hue-Bot/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..9ac7d21
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace BlubbFish.IoT.Bot.HueBot.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BlubbFish.IoT.Bot.HueBot.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        /// </summary>
+        internal static System.Drawing.Icon Icon {
+            get {
+                object obj = ResourceManager.GetObject("Icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+    }
+}
diff --git a/Hue-Bot/Hue-Bot/Properties/Resources.resx b/Hue-Bot/Hue-Bot/Properties/Resources.resx
new file mode 100644
index 0000000..d06ba97
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Hue-Bot/Hue-Bot/Resources/Icon.ico b/Hue-Bot/Hue-Bot/Resources/Icon.ico
new file mode 100644
index 0000000..241c871
Binary files /dev/null and b/Hue-Bot/Hue-Bot/Resources/Icon.ico differ
diff --git a/Hue-Bot/Hue-Bot/Resources/Icon.png b/Hue-Bot/Hue-Bot/Resources/Icon.png
new file mode 100644
index 0000000..f367b5d
Binary files /dev/null and b/Hue-Bot/Hue-Bot/Resources/Icon.png differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/ConnectorDataMqtt.dll b/Hue-Bot/Hue-Bot/bin/Release/ConnectorDataMqtt.dll
new file mode 100644
index 0000000..ef7007b
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/ConnectorDataMqtt.dll differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/Hue-Bot.exe b/Hue-Bot/Hue-Bot/bin/Release/Hue-Bot.exe
new file mode 100644
index 0000000..ddb356e
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/Hue-Bot.exe differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/Hue.dll b/Hue-Bot/Hue-Bot/bin/Release/Hue.dll
new file mode 100644
index 0000000..30deab9
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/Hue.dll differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/M2Mqtt.dll b/Hue-Bot/Hue-Bot/bin/Release/M2Mqtt.dll
new file mode 100644
index 0000000..dcbbb88
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/M2Mqtt.dll differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/Utils-IoT.dll b/Hue-Bot/Hue-Bot/bin/Release/Utils-IoT.dll
new file mode 100644
index 0000000..88af254
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/Utils-IoT.dll differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/Utils.dll b/Hue-Bot/Hue-Bot/bin/Release/Utils.dll
new file mode 100644
index 0000000..1153098
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/Utils.dll differ
diff --git a/Hue-Bot/Hue-Bot/bin/Release/litjson.dll b/Hue-Bot/Hue-Bot/bin/Release/litjson.dll
new file mode 100644
index 0000000..d2229a7
Binary files /dev/null and b/Hue-Bot/Hue-Bot/bin/Release/litjson.dll differ
diff --git a/Hue-Bot/Hue-Bot/lib/Events.cs b/Hue-Bot/Hue-Bot/lib/Events.cs
new file mode 100644
index 0000000..5d3aa90
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/lib/Events.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlubbFish.IoT.Bot.HueBot.lib {
+  public class CronEvent : ModulEventArgs {
+
+    public CronEvent() {
+    }
+
+    public CronEvent(String addr, String prop, String value) {
+      this.Address = addr;
+      this.Property = prop;
+      this.Value = value;
+      this.Source = "Cronjob";
+    }
+  }
+  public class OvertakerEvent : ModulEventArgs {
+
+    public OvertakerEvent() {
+    }
+
+    public OvertakerEvent(String addr, String prop, String value) {
+      this.Address = addr;
+      this.Property = prop;
+      this.Value = value;
+      this.Source = "Overtaker";
+    }
+  }
+
+  public class MqttEvent : ModulEventArgs {
+    public MqttEvent() {
+    }
+    public MqttEvent(String topic, String text) {
+      this.Address = topic;
+      this.Value = text;
+      this.Source = "MQTT";
+    }
+    public override String ToString() {
+      return this.Source + ": on " + this.Address + " set " + this.Value;
+    }
+  }
+
+  public class StatusPollingEvent : ModulEventArgs {
+    public StatusPollingEvent() {
+    }
+
+    public StatusPollingEvent(String text, String node) {
+      this.Value = text;
+      this.Address = node;
+      this.Source = "POLLING";
+    }
+
+    public override String ToString() {
+      return this.Source + ": " + this.Value + " on " + this.Address;
+    }
+  }
+
+  public class ModulEventArgs : EventArgs {
+    public ModulEventArgs() {
+    }
+    public String Address { get; protected set; }
+    public String Property { get; protected set; }
+    public String Value { get; protected set; }
+    public String Source { get; protected set; }
+    public override String ToString() {
+      return this.Source + ": " + this.Address + " set " + this.Property + " to " + this.Value;
+    }
+  }
+}
diff --git a/Hue-Bot/Hue-Bot/lib/Helper.cs b/Hue-Bot/Hue-Bot/lib/Helper.cs
new file mode 100644
index 0000000..f278e68
--- /dev/null
+++ b/Hue-Bot/Hue-Bot/lib/Helper.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Reflection;
+
+namespace BlubbFish.IoT.Bot.HueBot.lib {
+  static class Helper {
+    public static void SetProperty(this Object o, String name, String value) {
+      PropertyInfo prop = o.GetType().GetProperty(name);
+      if (prop.CanWrite) {
+        if (prop.PropertyType == typeof(Boolean) && Boolean.TryParse(value, out Boolean vb)) {
+          prop.SetValue(o, vb);
+        } else if (prop.PropertyType == typeof(Byte) && Byte.TryParse(value, out Byte v8)) {
+          prop.SetValue(o, v8);
+        } else if (prop.PropertyType == typeof(Int32) && Int32.TryParse(value, out Int32 v32)) {
+          prop.SetValue(o, v32);
+        } else if (prop.PropertyType == typeof(Single) && Single.TryParse(value, out Single vs)) {
+          prop.SetValue(o, vs);
+        } else if (prop.PropertyType == typeof(Double) && Double.TryParse(value, out Double vd)) {
+          prop.SetValue(o, vd);
+        } else if (prop.PropertyType == typeof(Int64) && Int64.TryParse(value, out Int64 v64)) {
+          prop.SetValue(o, v64);
+        } else if (prop.PropertyType.BaseType == typeof(Enum)) {
+          try {
+            prop.SetValue(o, Enum.Parse(prop.PropertyType, value));
+          } catch (Exception) { }
+        }
+      }
+    }
+
+    internal static Boolean HasProperty(this Object o, String type) {
+      Type t = o.GetType();
+      foreach (PropertyInfo item in t.GetProperties()) {
+        if (item.Name == type) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    internal static Object GetProperty(this Object o, String name) {
+      PropertyInfo prop = o.GetType().GetProperty(name);
+      if (prop.CanRead) {
+        return prop.GetValue(o);
+      }
+      return null;
+    }
+
+    internal static Boolean HasAbstract(this Object o, Type type) {
+      if (o.GetType().BaseType == type) {
+        return true;
+      }
+      return false;
+    }
+
+    internal static Boolean HasInterface(this Type o, String type) {
+      foreach (Type item in o.GetInterfaces()) {
+        if (item.Name == type) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    internal static void WriteError(String text) {
+      Console.ForegroundColor = ConsoleColor.Red;
+      Console.Error.WriteLine("ERROR: " + text);
+      Console.ResetColor();
+    }
+
+    internal static String ToUpperLower(this String s) {
+      if (s.Length == 0) {
+        return "";
+      }
+      if (s.Length == 1) {
+        return s.ToUpper();
+      }
+      return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
+    }
+  }
+}
diff --git a/Hue/Hue.sln b/Hue/Hue.sln
new file mode 100644
index 0000000..4530c96
--- /dev/null
+++ b/Hue/Hue.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hue", "Hue\Hue.csproj", "{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8F059288-842C-4EA3-AFD4-9AE2E17BD1B3}
+	EndGlobalSection
+EndGlobal
diff --git a/Hue/Hue/Devices/Configs/Config.cs b/Hue/Hue/Devices/Configs/Config.cs
new file mode 100644
index 0000000..dd895ab
--- /dev/null
+++ b/Hue/Hue/Devices/Configs/Config.cs
@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Configs {
+  public class Config : AConfig {
+    #region Properties
+    private String _name;
+    public String Name {
+      get {
+        return this._name;
+      }
+      set {
+        if(this.SetConfig(new Dictionary<String, Object>() { { "name", value } })) {
+          this._name = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private Boolean _linkbutton;
+    public Boolean Linkbutton {
+      get {
+        return this._linkbutton;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "linkbutton", value } })) {
+          this._linkbutton = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private String _ipaddress;
+    public String Ipaddress {
+      get {
+        return this._ipaddress;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "ipaddress", value } })) {
+          this._ipaddress = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private String _netmask;
+    public String Netmask {
+      get {
+        return this._netmask;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "netmask", value } })) {
+          this._netmask = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private String _gateway;
+    public String Gateway {
+      get {
+        return this._gateway;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "gateway", value } })) {
+          this._gateway = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private Boolean _dhcp;
+    public Boolean Dhcp {
+      get {
+        return this._dhcp;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "dhcp", value } })) {
+          this._dhcp = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private DateTime _utc;
+    public DateTime Utc {
+      get {
+        return this._utc;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "UTC", value } })) {
+          this._utc = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private String _timezone;
+    public String Timezone {
+      get {
+        return this._timezone;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "timezone", value } })) {
+          this._timezone = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    private Byte _zigbeechannel;
+    public Byte Zigbeechannel {
+      get {
+        return this._zigbeechannel;
+      }
+      set {
+        if (this.SetConfig(new Dictionary<String, Object>() { { "zigbeechannel", value } })) {
+          this._zigbeechannel = value;
+          this.NotifyClient<ConfigUpdateEvent>(value);
+        }
+      }
+    }
+    public String Apiversion { get; private set; }
+    public String Swversion { get; private set; }
+    public String Mac { get; private set; }
+    public Boolean Portalservices { get; private set; }
+    public DateTime Localtime { get; private set; }
+    public String Modelid { get; private set; }
+    public String Bridgeid { get; private set; }
+    public String Replacesbridgeid { get; private set; }
+    public Boolean Factorynew { get; private set; }
+    public String Datastoreversion { get; private set; }
+    public String Starterkitid { get; private set; }
+    public SwUpdate SwUpdate2 { get; private set; }
+    public Portalstate Portalstate { get; private set; }
+    public ReadOnlyDictionary<String, Whitelist> Whitelist { get; private set; }
+    #endregion
+
+    #region Constructor
+    public Config(JsonData json, HttpConnection http, Boolean polling) : base(json, http, polling) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        this._name = json["name"].ToString();
+      }
+      if (json.ContainsKey("apiversion") && json["apiversion"].IsString) {
+        this.Apiversion = json["apiversion"].ToString();
+      }
+      if (json.ContainsKey("swversion") && json["swversion"].IsString) {
+        this.Swversion = json["swversion"].ToString();
+      }
+      if (json.ContainsKey("linkbutton") && json["linkbutton"].IsBoolean) {
+        this._linkbutton = (Boolean)json["linkbutton"];
+      }
+      if (json.ContainsKey("ipaddress") && json["ipaddress"].IsString) {
+        this._ipaddress = json["ipaddress"].ToString();
+      }
+      if (json.ContainsKey("mac") && json["mac"].IsString) {
+        this.Mac = json["mac"].ToString();
+      }
+      if (json.ContainsKey("netmask") && json["netmask"].IsString) {
+        this._netmask = json["netmask"].ToString();
+      }
+      if (json.ContainsKey("gateway") && json["gateway"].IsString) {
+        this._gateway = json["gateway"].ToString();
+      }
+      if (json.ContainsKey("dhcp") && json["dhcp"].IsBoolean) {
+        this._dhcp = (Boolean)json["dhcp"];
+      }
+      if (json.ContainsKey("portalservices") && json["portalservices"].IsBoolean) {
+        this.Portalservices = (Boolean)json["portalservices"];
+      }
+      if (json.ContainsKey("UTC") && json["UTC"].IsString) {
+        this._utc = DateTime.Parse(json["UTC"].ToString());
+      }
+      if (json.ContainsKey("localtime") && json["localtime"].IsString) {
+        this.Localtime = DateTime.Parse(json["localtime"].ToString());
+      }
+      if (json.ContainsKey("timezone") && json["timezone"].IsString) {
+        this._timezone = json["timezone"].ToString();
+      }
+      if (json.ContainsKey("zigbeechannel") && json["zigbeechannel"].IsInt) {
+        this._zigbeechannel = (Byte)json["zigbeechannel"];
+      }
+      if (json.ContainsKey("modelid") && json["modelid"].IsString) {
+        this.Modelid = json["modelid"].ToString();
+      }
+      if (json.ContainsKey("bridgeid") && json["bridgeid"].IsString) {
+        this.Bridgeid = json["bridgeid"].ToString();
+      }
+      if (json.ContainsKey("replacesbridgeid") && json["replacesbridgeid"] != null && json["replacesbridgeid"].IsString) {
+        this.Replacesbridgeid = json["replacesbridgeid"].ToString();
+      }
+      if (json.ContainsKey("factorynew") && json["factorynew"].IsBoolean) {
+        this.Factorynew = (Boolean)json["factorynew"];
+      }
+      if (json.ContainsKey("datastoreversion") && json["datastoreversion"].IsString) {
+        this.Datastoreversion = json["datastoreversion"].ToString();
+      }
+      if (json.ContainsKey("starterkitid") && json["starterkitid"].IsString) {
+        this.Starterkitid = json["starterkitid"].ToString();
+      }
+      if (json.ContainsKey("swupdate2") && json["swupdate2"].IsObject) {
+        this.SwUpdate2 = new SwUpdate(json["swupdate2"], this.http, this.Polling);
+        this.SwUpdate2.Update += this.NotifyClientChildren;
+      }
+      if (json.ContainsKey("whitelist") && json["whitelist"].IsObject) {
+        this.CreateWhitelist(json["whitelist"]);
+      }
+      if (json.ContainsKey("portalstate") && json["portalstate"].IsObject) {
+        this.Portalstate = new Portalstate(json["portalstate"], this.http, this.Polling);
+        this.Portalstate.Update += this.NotifyClientChildren;
+      }
+    }
+
+    private void CreateWhitelist(JsonData json) {
+      Dictionary<String, Whitelist> whitelists = new Dictionary<String, Whitelist>();
+      foreach (String item in json.Keys) {
+        Whitelist w = new Whitelist(json[item], new Tuple<String>(item), this.http, this.Polling);
+        w.Update += this.NotifyClientChildren;
+        whitelists.Add(item, w);
+      }
+      this.Whitelist = new ReadOnlyDictionary<String, Whitelist>(whitelists);
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Config: " + this.Name + " Ip-" + this.Ipaddress + " DHCP-" + this.Dhcp + " Time-" + this.Localtime + " User-" + this.Whitelist.Count;
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        if (this.Name != json["name"].ToString()) {
+          this._name = json["name"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Name);
+        }
+      }
+      if (json.ContainsKey("apiversion") && json["apiversion"].IsString) {
+        if (this.Apiversion != json["apiversion"].ToString()) {
+          this.Apiversion = json["apiversion"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Apiversion);
+        }
+      }
+      if (json.ContainsKey("swversion") && json["swversion"].IsString) {
+        if (this.Swversion != json["swversion"].ToString()) {
+          this.Swversion = json["swversion"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Swversion);
+        }
+      }
+      if (json.ContainsKey("linkbutton") && json["linkbutton"].IsBoolean) {
+        if (this.Linkbutton != (Boolean)json["linkbutton"]) {
+          this._linkbutton = (Boolean)json["linkbutton"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Linkbutton);
+        }
+      }
+      if (json.ContainsKey("ipaddress") && json["ipaddress"].IsString) {
+        if (this.Ipaddress != json["ipaddress"].ToString()) {
+          this._ipaddress = json["ipaddress"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Ipaddress);
+        }
+      }
+      if (json.ContainsKey("mac") && json["mac"].IsString) {
+        if (this.Mac != json["mac"].ToString()) {
+          this.Mac = json["mac"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Mac);
+        }
+      }
+      if (json.ContainsKey("netmask") && json["netmask"].IsString) {
+        if (this.Netmask != json["netmask"].ToString()) {
+          this._netmask = json["netmask"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Netmask);
+        }
+      }
+      if (json.ContainsKey("gateway") && json["gateway"].IsString) {
+        if (this.Gateway != json["gateway"].ToString()) {
+          this._gateway = json["gateway"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Gateway);
+        }
+      }
+      if (json.ContainsKey("dhcp") && json["dhcp"].IsBoolean) {
+        if (this.Dhcp != (Boolean)json["dhcp"]) {
+          this._dhcp = (Boolean)json["dhcp"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Dhcp);
+        }
+      }
+      if (json.ContainsKey("portalservices") && json["portalservices"].IsBoolean) {
+        if (this.Portalservices != (Boolean)json["portalservices"]) {
+          this.Portalservices = (Boolean)json["portalservices"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Portalservices);
+        }
+      }
+      if (json.ContainsKey("UTC") && json["UTC"].IsString) {
+        if (this.Utc != DateTime.Parse(json["UTC"].ToString())) {
+          this._utc = DateTime.Parse(json["UTC"].ToString());
+          this.NotifyClient<ConfigUpdateEvent>(this.Utc);
+        }
+      }
+      if (json.ContainsKey("localtime") && json["localtime"].IsString) {
+        if (this.Localtime != DateTime.Parse(json["localtime"].ToString())) {
+          this.Localtime = DateTime.Parse(json["localtime"].ToString());
+          this.NotifyClient<ConfigUpdateEvent>(this.Localtime);
+        }
+      }
+      if (json.ContainsKey("timezone") && json["timezone"].IsString) {
+        if (this.Timezone != json["timezone"].ToString()) {
+          this._timezone = json["timezone"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Timezone);
+        }
+      }
+      if (json.ContainsKey("zigbeechannel") && json["zigbeechannel"].IsInt) {
+        if (this.Zigbeechannel != (Byte)json["zigbeechannel"]) {
+          this._zigbeechannel = (Byte)json["zigbeechannel"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Zigbeechannel);
+        }
+      }
+      if (json.ContainsKey("modelid") && json["modelid"].IsString) {
+        if (this.Modelid != json["modelid"].ToString()) {
+          this.Modelid = json["modelid"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Modelid);
+        }
+      }
+      if (json.ContainsKey("bridgeid") && json["bridgeid"].IsString) {
+        if (this.Bridgeid != json["bridgeid"].ToString()) {
+          this.Bridgeid = json["bridgeid"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Bridgeid);
+        }
+      }
+      if (json.ContainsKey("replacesbridgeid") && json["replacesbridgeid"] != null && json["replacesbridgeid"].IsString) {
+        if (this.Replacesbridgeid != json["replacesbridgeid"].ToString()) {
+          this.Replacesbridgeid = json["replacesbridgeid"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Replacesbridgeid);
+        }
+      }
+      if (json.ContainsKey("factorynew") && json["factorynew"].IsBoolean) {
+        if (this.Factorynew != (Boolean)json["factorynew"]) {
+          this.Factorynew = (Boolean)json["factorynew"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Factorynew);
+        }
+      }
+      if (json.ContainsKey("datastoreversion") && json["datastoreversion"].IsString) {
+        if (this.Datastoreversion != json["datastoreversion"].ToString()) {
+          this.Datastoreversion = json["datastoreversion"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Datastoreversion);
+        }
+      }
+      if (json.ContainsKey("starterkitid") && json["starterkitid"].IsString) {
+        if (this.Starterkitid != json["starterkitid"].ToString()) {
+          this.Starterkitid = json["starterkitid"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Starterkitid);
+        }
+      }
+      if (json.ContainsKey("swupdate2") && json["swupdate2"].IsObject) {
+        this.SwUpdate2?.SetUpdate(json["swupdate2"]);
+      }
+      if (json.ContainsKey("whitelist") && json["whitelist"].IsObject) {
+        foreach (String item in json["whitelist"].Keys) {
+          if(this.Whitelist.ContainsKey(item)) {
+            this.Whitelist[item].SetUpdate(json["whitelist"][item]);
+          }
+        }
+      } 
+      if (json.ContainsKey("portalstate") && json["portalstate"].IsObject) {
+        this.Portalstate?.SetUpdate(json["portalstate"]);
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Configs/Portalstate.cs b/Hue/Hue/Devices/Configs/Portalstate.cs
new file mode 100644
index 0000000..00a6340
--- /dev/null
+++ b/Hue/Hue/Devices/Configs/Portalstate.cs
@@ -0,0 +1,71 @@
+using System;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Configs {
+  public class Portalstate : AConfig {
+
+    #region Properties
+    public Boolean Signedon { get; private set; }
+    public Boolean Incoming { get; private set; }
+    public Boolean Outgoing { get; private set; }
+    public String Communication { get; private set; }
+    #endregion
+
+    #region Constrctor
+    public Portalstate(JsonData json, HttpConnection http, Boolean polling) : base(json, http, polling) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("signedon") && json["signedon"].IsBoolean) {
+        this.Signedon = (Boolean)json["signedon"];
+      }
+      if (json.ContainsKey("incoming") && json["incoming"].IsBoolean) {
+        this.Incoming = (Boolean)json["incoming"];
+      }
+      if (json.ContainsKey("outgoing") && json["outgoing"].IsBoolean) {
+        this.Outgoing = (Boolean)json["outgoing"];
+      }
+      if (json.ContainsKey("communication") && json["communication"].IsString) {
+        this.Communication = json["communication"].ToString();
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Portalstate: On-" + this.Signedon + " In-" + this.Incoming + " Out-" + this.Outgoing + " Communication-" + this.Communication;
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("signedon") && json["signedon"].IsBoolean) {
+        if (this.Signedon != (Boolean)json["signedon"]) {
+          this.Signedon = (Boolean)json["signedon"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Signedon);
+        }
+      }
+      if (json.ContainsKey("incoming") && json["incoming"].IsBoolean) {
+        if (this.Incoming != (Boolean)json["incoming"]) {
+          this.Incoming = (Boolean)json["incoming"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Incoming);
+        }
+      }
+      if (json.ContainsKey("outgoing") && json["outgoing"].IsBoolean) {
+        if (this.Outgoing != (Boolean)json["outgoing"]) {
+          this.Outgoing = (Boolean)json["outgoing"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Outgoing);
+        }
+      }
+      if (json.ContainsKey("communication") && json["communication"].IsString) {
+        if (this.Communication != json["communication"].ToString()) {
+          this.Communication = json["communication"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Communication);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Configs/SwUpdate.cs b/Hue/Hue/Devices/Configs/SwUpdate.cs
new file mode 100644
index 0000000..3a91bf8
--- /dev/null
+++ b/Hue/Hue/Devices/Configs/SwUpdate.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Configs {
+  public class SwUpdate : AConfig {
+    #region Properties
+    public Boolean Checkforupdate { get; private set; }
+    public DateTime Lastchange { get; private set; }
+    public String Bridgestate { get; private set; }
+    public DateTime Bridgelastinstall { get; private set; }
+    public String State { get; private set; }
+    public String Autoinstallupdatetime { get; private set; }
+    public Boolean Autoinstallon { get; private set; }
+    #endregion
+
+    #region Constructor
+    public SwUpdate(JsonData json, HttpConnection http, Boolean polling) : base(json, http, polling) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if(json.ContainsKey("checkforupdate") && json["checkforupdate"].IsBoolean) {
+        this.Checkforupdate = (Boolean)json["checkforupdate"];
+      }
+      if (json.ContainsKey("lastchange") && json["lastchange"].IsString) {
+        this.Lastchange = DateTime.Parse(json["lastchange"].ToString()).ToLocalTime();
+      }
+      if (json.ContainsKey("bridge") && json["bridge"].IsObject) {
+        if (json["bridge"].ContainsKey("state") && json["bridge"]["state"].IsString) {
+          this.Bridgestate = json["bridge"]["state"].ToString();
+        }
+        if (json["bridge"].ContainsKey("lastinstall") && json["bridge"]["lastinstall"].IsString) {
+          this.Bridgelastinstall = DateTime.Parse(json["bridge"]["lastinstall"].ToString()).ToLocalTime();
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].IsString) {
+        this.State = json["state"].ToString();
+      }
+      if (json.ContainsKey("autoinstall") && json["autoinstall"].IsObject) {
+        if (json["autoinstall"].ContainsKey("updatetime") && json["autoinstall"]["updatetime"].IsString) {
+          this.Autoinstallupdatetime = json["autoinstall"]["updatetime"].ToString();
+        }
+        if (json["autoinstall"].ContainsKey("on") && json["autoinstall"]["on"].IsBoolean) {
+          this.Autoinstallon = (Boolean)json["autoinstall"]["on"];
+        }
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Updates: Check-" + this.Checkforupdate + " LatestCheck-" + this.Lastchange + " Updates-" + this.Bridgestate + " Installed-" + this.Bridgelastinstall + " State-" + this.State + " AutoTime-" + this.Autoinstallupdatetime + " AutoOn-" + this.Autoinstallon;
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("checkforupdate") && json["checkforupdate"].IsBoolean) {
+        if (this.Checkforupdate != (Boolean)json["checkforupdate"]) {
+          this.Checkforupdate = (Boolean)json["checkforupdate"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Checkforupdate);
+        }
+      }
+      if (json.ContainsKey("lastchange") && json["lastchange"].IsString) {
+        if (this.Lastchange != DateTime.Parse(json["lastchange"].ToString()).ToLocalTime()) {
+          this.Lastchange = DateTime.Parse(json["lastchange"].ToString()).ToLocalTime();
+          this.NotifyClient<ConfigUpdateEvent>(this.Lastchange);
+        }
+      }
+      if (json.ContainsKey("bridge") && json["bridge"].ContainsKey("state") && json["bridge"]["state"].IsString) {
+        if (this.Bridgestate != json["bridge"]["state"].ToString()) {
+          this.Bridgestate = json["bridge"]["state"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Bridgestate);
+        }
+      }
+      if (json.ContainsKey("bridge") && json["bridge"].ContainsKey("lastinstall") && json["bridge"]["lastinstall"].IsString) {
+        if (this.Bridgelastinstall != DateTime.Parse(json["bridge"]["lastinstall"].ToString()).ToLocalTime()) {
+          this.Bridgelastinstall = DateTime.Parse(json["bridge"]["lastinstall"].ToString()).ToLocalTime();
+          this.NotifyClient<ConfigUpdateEvent>(this.Bridgelastinstall);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].IsString) {
+        if (this.State != json["state"].ToString()) {
+          this.State = json["state"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.State);
+        }
+      }
+      if (json.ContainsKey("autoinstall") && json["autoinstall"].ContainsKey("updatetime") && json["autoinstall"]["updatetime"].IsString) {
+        if (this.Autoinstallupdatetime != json["autoinstall"]["updatetime"].ToString()) {
+          this.Autoinstallupdatetime = json["autoinstall"]["updatetime"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Autoinstallupdatetime);
+        }
+      }
+      if (json.ContainsKey("autoinstall") && json["autoinstall"].ContainsKey("on") && json["autoinstall"]["on"].IsBoolean) {
+        if (this.Autoinstallon != (Boolean)json["autoinstall"]["on"]) {
+          this.Autoinstallon = (Boolean)json["autoinstall"]["on"];
+          this.NotifyClient<ConfigUpdateEvent>(this.Autoinstallon);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Configs/Whitelist.cs b/Hue/Hue/Devices/Configs/Whitelist.cs
new file mode 100644
index 0000000..d4acf06
--- /dev/null
+++ b/Hue/Hue/Devices/Configs/Whitelist.cs
@@ -0,0 +1,62 @@
+using System;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Configs {
+  public class Whitelist : AConfig {
+    #region Properties
+    public DateTime Lastusedate { get; private set; }
+    public DateTime Createdate { get; private set; }
+    public String Name { get; private set; }
+    public String UserId { get; }
+    #endregion
+
+    #region Constructor
+    public Whitelist(JsonData json, Tuple<String> id, HttpConnection http, Boolean polling) : base(json, http, polling) {
+      this.UserId = id.Item1;
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("last use date") && json["last use date"].IsString) {
+        this.Lastusedate = DateTime.Parse(json["last use date"].ToString()).ToLocalTime();
+      }
+      if (json.ContainsKey("create date") && json["create date"].IsString) {
+        this.Createdate = DateTime.Parse(json["create date"].ToString()).ToLocalTime();
+      }
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        this.Name = json["name"].ToString();
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "User [" + this.UserId + "]: " + this.Name + " (Create-" + this.Createdate + " LastOn-" + this.Lastusedate + ")";
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("last use date") && json["last use date"].IsString) {
+        if (this.Lastusedate != DateTime.Parse(json["last use date"].ToString()).ToLocalTime()) {
+          this.Lastusedate = DateTime.Parse(json["last use date"].ToString()).ToLocalTime();
+          this.NotifyClient<ConfigUpdateEvent>(this.Lastusedate);
+        }
+      }
+      if (json.ContainsKey("create date") && json["create date"].IsString) {
+        if (this.Createdate != DateTime.Parse(json["create date"].ToString()).ToLocalTime()) {
+          this.Createdate = DateTime.Parse(json["create date"].ToString()).ToLocalTime();
+          this.NotifyClient<ConfigUpdateEvent>(this.Createdate);
+        }
+      }
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        if (this.Name != json["name"].ToString()) {
+          this.Name = json["name"].ToString();
+          this.NotifyClient<ConfigUpdateEvent>(this.Name);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Groups/Room.cs b/Hue/Hue/Devices/Groups/Room.cs
new file mode 100644
index 0000000..48eff78
--- /dev/null
+++ b/Hue/Hue/Devices/Groups/Room.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Groups {
+  public class Room : AGroup {
+    public enum AlertEffect {
+      none,
+      select,
+      lselect
+    }
+
+    #region Properties
+    private AlertEffect _alert;
+    
+    private Boolean _state;
+    public Boolean State {
+      get {
+        return this._state;
+      }
+      set {
+        if(this.SetGroupAction(new Dictionary<String, Object>() { { "on", value } })) {
+          this._state = value;
+          this.NotifyClient<GroupUpdateEvent>(value);
+        }
+      }
+    }
+    private Byte _brightness;
+    public Byte Brightness {
+      get {
+        return this._brightness;
+      }
+      set {
+        if(this.SetGroupAction(new Dictionary<String, Object>() { { "bri", value } })) {
+          this._brightness = value;
+          this.NotifyClient<GroupUpdateEvent>(value);
+        }
+      }
+    }
+    public AlertEffect Alert {
+      get {
+        return this._alert;
+      }
+      set {
+        if(this.SetGroupAction(new Dictionary<String, Object>() { { "alert", value } })) {
+          this._alert = value;
+          this.NotifyClient<GroupUpdateEvent>(value);
+        }
+      }
+    }
+    #endregion
+
+    #region Constructor
+    public Room(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) : base(json, id, http, polling, lights) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("action")) {
+        JsonData state = json["action"];
+        if (state.ContainsKey("on") && state["on"].IsBoolean) {
+          this._state = (Boolean)state["on"];
+        }
+        if (state.ContainsKey("bri") && state["bri"].IsInt) {
+          this._brightness = (Byte)state["bri"];
+        }
+        if (state.ContainsKey("alert") && state["alert"].IsString) {
+          this._alert = (AlertEffect)Enum.Parse(typeof(AlertEffect), state["alert"].ToString());
+        }
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      List<String> lid = new List<String>();
+      foreach (KeyValuePair<Int32, ALight> item in this.Lights) {
+        lid.Add(item.Key.ToString());
+      }
+      return "Group " + this.Name + " [" + this.GroupId + "]: (Class-"+ Helper.GetEnumDescription(this.Class) + ", ["+String.Join(",",lid.ToArray())+"]) On-" + this.State.ToString() + " Bri-" + this.Brightness + " Alert-" + this.Alert.ToString() + " AllOn-" + this.StateAllOn.ToString() + " AnyOn-" + this.StateAnyOn.ToString();
+    }
+
+    public override void SetUpdate(JsonData json) {
+      base.SetUpdate(json);
+      if (json.ContainsKey("on") && json["on"].IsBoolean) {
+        if (this.State != (Boolean)json["on"]) {
+          this._state = (Boolean)json["on"];
+          this.NotifyClient<GroupUpdateEvent>(this.State);
+        }
+      }
+      if (json.ContainsKey("bri") && json["bri"].IsInt) {
+        if (this.Brightness != (Byte)json["bri"]) {
+          this._brightness = (Byte)json["bri"];
+          this.NotifyClient<GroupUpdateEvent>(this.Brightness);
+        }
+      }
+      if (json.ContainsKey("alert") && json["alert"].IsString) {
+        if (this.Alert != (AlertEffect)Enum.Parse(typeof(AlertEffect), json["alert"].ToString())) {
+          this._alert = (AlertEffect)Enum.Parse(typeof(AlertEffect), json["alert"].ToString());
+          this.NotifyClient<GroupUpdateEvent>(this.Alert);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Lights/Dimmablelight.cs b/Hue/Hue/Devices/Lights/Dimmablelight.cs
new file mode 100644
index 0000000..752422d
--- /dev/null
+++ b/Hue/Hue/Devices/Lights/Dimmablelight.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Lights {
+  public class Dimmablelight : ALight {
+    public enum AlertEffect {
+      none,
+      select,
+      lselect
+    }
+
+    #region Properties
+    private Boolean _state;
+    public Boolean State {
+      get {
+        return this._state;
+      }
+      set {
+        if(this.SetLightStateAttribute(new Dictionary<String, Object>() { { "on", value } })) {
+          this._state = value;
+          this.NotifyClient<LightUpdateEvent>(value);
+        }
+      }
+    }
+    private Byte _brightness;
+    public Byte Brightness {
+      get {
+        return this._brightness;
+      }
+      set {
+        if(this.SetLightStateAttribute(new Dictionary<String, Object>() { { "bri", value } })) {
+          this._brightness = value;
+          this.NotifyClient<LightUpdateEvent>(value);
+        }
+      }
+    }
+    private AlertEffect _alert;
+    public AlertEffect Alert {
+      get {
+        return this._alert;
+      }
+      set {
+        if(this.SetLightStateAttribute(new Dictionary<String, Object>() { { "alert", value.ToString() } })) {
+          this._alert = value;
+          this.NotifyClient<LightUpdateEvent>(value);
+        }
+      }
+    }
+    public Boolean Reachable { get; private set; }
+    #endregion
+
+    #region Constructor
+    public Dimmablelight(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("state")) {
+        JsonData state = json["state"];
+        if (state.ContainsKey("on") && state["on"].IsBoolean) {
+          this._state = (Boolean)state["on"];
+        }
+        if (state.ContainsKey("bri") && state["bri"].IsInt) {
+          this._brightness = (Byte)state["bri"];
+        }
+        if (state.ContainsKey("alert") && state["alert"].IsString) {
+          this._alert = (AlertEffect)Enum.Parse(typeof(AlertEffect), state["alert"].ToString());
+        }
+        if (state.ContainsKey("reachable") && state["reachable"].IsBoolean) {
+          this.Reachable = (Boolean)state["reachable"];
+        }
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Light " + this.Name + " [" + this.LightId + "]: On-" + this.State.ToString() + " Bri-" + this.Brightness + " Alert-" + this.Alert.ToString() + " Reachable-" + this.Reachable.ToString();
+    }
+    public override void SetUpdate(JsonData json) {
+      base.SetUpdate(json);
+      if (json.ContainsKey("state") && json["state"].ContainsKey("on") && json["state"]["on"].IsBoolean) {
+        if (this.State != (Boolean)json["state"]["on"]) {
+          this._state = (Boolean)json["state"]["on"];
+          this.NotifyClient<LightUpdateEvent>(this.State);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("bri") && json["state"]["bri"].IsInt) {
+        if (this.Brightness != (Byte)json["state"]["bri"]) {
+          this._brightness = (Byte)json["state"]["bri"];
+          this.NotifyClient<LightUpdateEvent>(this.Brightness);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("alert") && json["state"]["alert"].IsString) {
+        if (this.Alert != (AlertEffect)Enum.Parse(typeof(AlertEffect), json["state"]["alert"].ToString())) {
+          this._alert = (AlertEffect)Enum.Parse(typeof(AlertEffect), json["state"]["alert"].ToString());
+          this.NotifyClient<LightUpdateEvent>(this.Alert);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("reachable") && json["state"]["reachable"].IsBoolean) {
+        if (this.Reachable != (Boolean)json["state"]["reachable"]) {
+          this.Reachable = (Boolean)json["state"]["reachable"];
+          this.NotifyClient<LightUpdateEvent>(this.Reachable);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Scenes/LightState.cs b/Hue/Hue/Devices/Scenes/LightState.cs
new file mode 100644
index 0000000..26e9932
--- /dev/null
+++ b/Hue/Hue/Devices/Scenes/LightState.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Scenes {
+  public class LightState : AScene {
+    #region Properties
+    private Boolean _state;
+    public Boolean State {
+      get {
+        return this._state;
+      }
+      set {
+        if (this.SetLightSceneAttribute(new Dictionary<String, Object>() { { "on", value } })) {
+          this._state = value;
+          this.NotifyClient<SceneUpdateEvent>(value);
+        }
+      }
+    }
+    private Byte _brightness;
+    public Byte Brightness {
+      get {
+        return this._brightness;
+      }
+      set {
+        if(this.SetLightSceneAttribute(new Dictionary<String, Object>() { { "bri", value } })) {
+          this._brightness = value;
+          this.NotifyClient<SceneUpdateEvent>(value);
+        }
+      }
+    }
+    #endregion
+
+    #region Constructor
+    public LightState(JsonData json, Tuple<String, Int32> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) : base(json, id, http, polling, lights){
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("on") && json["on"].IsBoolean) {
+        this._state = (Boolean)json["on"];
+      }
+      if (json.ContainsKey("bri") && json["bri"].IsInt) {
+        this._brightness = (Byte)json["bri"];
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Scene LightState " + this.SceneId + " [" + this.LightStateId + "]: On-" + this.State.ToString() + " Bri-" + this.Brightness;
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("on") && json["on"].IsBoolean) {
+        if (this.State != (Boolean)json["on"]) {
+          this._state = (Boolean)json["on"];
+          this.NotifyClient<SceneUpdateEvent>(this.State);
+        }
+      }
+      if (json.ContainsKey("bri") && json["bri"].IsInt) {
+        if (this.Brightness != (Byte)json["bri"]) {
+          this._brightness = (Byte)json["bri"];
+          this.NotifyClient<SceneUpdateEvent>(this.Brightness);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Scenes/Scene.cs b/Hue/Hue/Devices/Scenes/Scene.cs
new file mode 100644
index 0000000..5c838a7
--- /dev/null
+++ b/Hue/Hue/Devices/Scenes/Scene.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Scenes {
+  class Scene : AScene {
+    #region Properties
+    private String _name;
+    public String Name {
+      get {
+        return this._name;
+      }
+      set {
+        if (this.SetSceneAttribute(new Dictionary<String, Object>() { { "name", value } })) {
+          this._name = value;
+          this.NotifyClient<SceneUpdateEvent>(value);
+        }
+      }
+    }
+    public String Owner { get; private set; }
+    public Boolean Recycle { get; private set; }
+    public Boolean Locked { get; private set; }
+    public String Picture { get; private set; }
+    public DateTime Lastupdated { get; private set; }
+    public Int32 Version { get; private set; }
+    public ReadOnlyDictionary<Int32, ALight> Lights { get; private set; }
+    public ReadOnlyDictionary<Int32, LightState> LightStates { get; private set; }
+    #endregion
+
+    #region Constructor
+    public Scene(JsonData json, Tuple<String> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) : base(json, new Tuple<String, Int32>(id.Item1, 0), http, polling, lights) {
+      this.ComplexInit(json, lights);
+    }
+
+    private void ComplexInit(JsonData json, ReadOnlyDictionary<Int32, ALight> lights) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        this._name = json["name"].ToString();
+      }
+      if (json.ContainsKey("owner") && json["owner"].IsString) {
+        this.Owner = json["owner"].ToString();
+      }
+      if (json.ContainsKey("recycle") && json["recycle"].IsBoolean) {
+        this.Recycle = (Boolean)json["recycle"];
+      }
+      if (json.ContainsKey("locked") && json["locked"].IsBoolean) {
+        this.Locked = (Boolean)json["locked"];
+      }
+      if (json.ContainsKey("picture") && json["picture"].IsString) {
+        this.Picture = json["picture"].ToString();
+      }
+      if (json.ContainsKey("lastupdated") && json["lastupdated"].IsString) {
+        this.Lastupdated = DateTime.Parse(json["lastupdated"].ToString());
+      }
+      if (json.ContainsKey("version") && json["version"].IsInt) {
+        this.Version = (Int32)json["version"];
+      }
+      if (json.ContainsKey("lights") && json["lights"].IsArray) {
+        Dictionary<Int32, ALight> lightdict = new Dictionary<Int32, ALight>();
+        foreach (JsonData item in json["lights"]) {
+          if (Int32.TryParse(item.ToString(), out Int32 lampid)) {
+            if (lights.ContainsKey(lampid)) {
+              lightdict.Add(lampid, lights[lampid]);
+            }
+          }
+        }
+        this.Lights = new ReadOnlyDictionary<Int32, ALight>(lightdict);
+      }
+      if (json.ContainsKey("lightstates") && json["lightstates"].IsObject) {
+        Dictionary<Int32, LightState> lightstates = new Dictionary<Int32, LightState>();
+        foreach (String item in json["lightstates"].Keys) {
+          LightState l = new LightState(json["lightstates"][item], new Tuple<String, Int32>(this.SceneId, Int32.Parse(item)), this.http, this.Polling, lights);
+          l.Update += this.NotifyClientChildren;
+          lightstates.Add(Int32.Parse(item), l);
+        }
+        this.LightStates = new ReadOnlyDictionary<Int32, LightState>(lightstates);
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      List<String> lid = new List<String>();
+      foreach (KeyValuePair<Int32, ALight> item in this.Lights) {
+        lid.Add(item.Key.ToString());
+      }
+      List<String> lst = new List<String>();
+      foreach (KeyValuePair<Int32, LightState> item in this.LightStates) {
+        lst.Add(item.Value.ToString());
+      }
+      return "Scene " + this.Name + " [" + this.SceneId + "]: (["+ String.Join(",", lid.ToArray()) +"]) Light-States ["+ String.Join(",", lst.ToArray())+"]";
+    }
+
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        if (this.Name != json["name"].ToString()) {
+          this._name = json["name"].ToString();
+          this.NotifyClient<SceneUpdateEvent>(this.Name);
+        }
+      }
+      if (json.ContainsKey("owner") && json["owner"].IsString) {
+        if (this.Owner != json["owner"].ToString()) {
+          this.Owner = json["owner"].ToString();
+          this.NotifyClient<SceneUpdateEvent>(this.Owner);
+        }
+      }
+      if (json.ContainsKey("recycle") && json["recycle"].IsBoolean) {
+        if (this.Recycle != (Boolean)json["recycle"]) {
+          this.Recycle = (Boolean)json["recycle"];
+          this.NotifyClient<SceneUpdateEvent>(this.Recycle);
+        }
+      }
+      if (json.ContainsKey("locked") && json["locked"].IsBoolean) {
+        if (this.Locked != (Boolean)json["locked"]) {
+          this.Locked = (Boolean)json["locked"];
+          this.NotifyClient<SceneUpdateEvent>(this.Locked);
+        }
+      }
+      if (json.ContainsKey("picture") && json["picture"].IsString) {
+        if (this.Picture != json["picture"].ToString()) {
+          this.Picture = json["picture"].ToString();
+          this.NotifyClient<SceneUpdateEvent>(this.Picture);
+        }
+      }
+      if (json.ContainsKey("lastupdated") && json["lastupdated"].IsString) {
+        if (this.Lastupdated != DateTime.Parse(json["lastupdated"].ToString())) {
+          this.Lastupdated = DateTime.Parse(json["lastupdated"].ToString());
+          this.NotifyClient<SceneUpdateEvent>(this.Lastupdated);
+        }
+      }
+      if (json.ContainsKey("version") && json["version"].IsInt) {
+        if (this.Version != (Int32)json["version"]) {
+          this.Version = (Int32)json["version"];
+          this.NotifyClient<SceneUpdateEvent>(this.Version);
+        }
+      }
+      if (json.ContainsKey("lightstates") && json["lightstates"].IsObject) {
+        foreach (String item in json["lightstates"].Keys) {
+          if(this.LightStates.ContainsKey(Int32.Parse(item))) {
+            this.LightStates[Int32.Parse(item)].SetUpdate(json["lightstates"][Int32.Parse(item)]);
+          }
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Devices/Sensors/Daylight.cs b/Hue/Hue/Devices/Sensors/Daylight.cs
new file mode 100644
index 0000000..2c382fc
--- /dev/null
+++ b/Hue/Hue/Devices/Sensors/Daylight.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Devices.Sensors {
+  class Daylight : ASensor {
+    #region Properties
+    private Boolean _on;
+    public Boolean On {
+      get {
+        return this._on;
+      }
+      set {
+        if(this.SetSensorConfig(new Dictionary<String, Object>() { { "on", value } })) {
+          this._on = value;
+          this.NotifyClient<SensorUpdateEvent>(value);
+        }
+      }
+    }
+    public Boolean Configured { get; private set; }
+    private Int32 _sunriseoffset;
+    public Int32 Sunriseoffset {
+      get {
+        return this._sunriseoffset;
+      }
+      set {
+        if(this.SetSensorConfig(new Dictionary<String, Object>() { { "sunriseoffset", value } })) {
+          this._sunriseoffset = value;
+          this.NotifyClient<SensorUpdateEvent>(value);
+        }
+      }
+    }
+    private Int32 _sunsetoffset;
+    public Int32 Sunsetoffset {
+      get {
+        return this._sunsetoffset;
+      }
+      set {
+        if(this.SetSensorConfig(new Dictionary<String, Object>() { { "sunsetoffset", value } })) {
+          this._sunsetoffset = value;
+          this.NotifyClient<SensorUpdateEvent>(value);
+        }
+      }
+    }
+    public Boolean IsDaylight { get; private set; }
+    #endregion
+
+    #region Constructor
+    public Daylight(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if(json.ContainsKey("config")) {
+        JsonData config = json["config"];
+        if(config.ContainsKey("on") && config["on"].IsBoolean) {
+          this._on = (Boolean)config["on"];
+        }
+        if(config.ContainsKey("configured") && config["configured"].IsBoolean) {
+          this.Configured = (Boolean)config["configured"];
+        }
+        if(config.ContainsKey("sunriseoffset") && config["sunriseoffset"].IsInt) {
+          this._sunriseoffset = (Int32)config["sunriseoffset"];
+        }
+        if(config.ContainsKey("sunsetoffset") && config["sunsetoffset"].IsInt) {
+          this._sunsetoffset = (Int32)config["sunsetoffset"];
+        }
+      }
+      if(json.ContainsKey("state")) {
+        JsonData state = json["state"];
+        if(state.ContainsKey("daylight") && state["daylight"].IsBoolean) {
+          this.IsDaylight = (Boolean)state["daylight"];
+        }
+      }
+    }
+    #endregion
+
+    #region AConnector
+    public override String ToString() {
+      return "Daylight " + this.Name + " [" + this.SensorId + "]: IsDaylight-" + this.IsDaylight.ToString() + " On-" + this.On.ToString() + " Configured-" + this.Configured.ToString() + " Sunriseoffset-" + this.Sunriseoffset.ToString() + " Sunsetoffset-" + this.Sunsetoffset.ToString();
+    }
+
+    public override void SetUpdate(JsonData json) {
+      base.SetUpdate(json);
+      if (json.ContainsKey("config") && json["config"].ContainsKey("on") && json["config"]["on"].IsBoolean) {
+        if (this.On != (Boolean)json["config"]["on"]) {
+          this._on = (Boolean)json["config"]["on"];
+          this.NotifyClient<SensorUpdateEvent>(this.On);
+        }
+      }
+      if (json.ContainsKey("config") && json["config"].ContainsKey("configured") && json["config"]["configured"].IsBoolean) {
+        if (this.Configured != (Boolean)json["config"]["configured"]) {
+          this.Configured = (Boolean)json["config"]["configured"];
+          this.NotifyClient<SensorUpdateEvent>(this.Configured);
+        }
+      }
+      if (json.ContainsKey("config") && json["config"].ContainsKey("sunriseoffset") && json["config"]["sunriseoffset"].IsInt) {
+        if (this.Sunriseoffset != (Int32)json["config"]["sunriseoffset"]) {
+          this._sunriseoffset = (Int32)json["config"]["sunriseoffset"];
+          this.NotifyClient<SensorUpdateEvent>(this.Sunriseoffset);
+        }
+      }
+      if (json.ContainsKey("config") && json["config"].ContainsKey("sunsetoffset") && json["config"]["sunsetoffset"].IsInt) {
+        if (this.Sunsetoffset != (Int32)json["config"]["sunsetoffset"]) {
+          this._sunsetoffset = (Int32)json["config"]["sunsetoffset"];
+          this.NotifyClient<SensorUpdateEvent>(this.Sunsetoffset);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("daylight") && json["state"]["daylight"].IsBoolean) {
+        if (this.IsDaylight != (Boolean)json["state"]["daylight"]) {
+          this.IsDaylight = (Boolean)json["state"]["daylight"];
+          this.NotifyClient<SensorUpdateEvent>(this.IsDaylight);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Events/UpdateEvent.cs b/Hue/Hue/Events/UpdateEvent.cs
new file mode 100644
index 0000000..fc19fef
--- /dev/null
+++ b/Hue/Hue/Events/UpdateEvent.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlubbFish.IoT.Hue.Events {
+  public class AllUpdateEvent : EventArgs {
+
+    public AllUpdateEvent() {
+    }
+
+    public AllUpdateEvent(Object value, DateTime time, Object parent) {
+      this.GetValue = value;
+      this.UpdateTime = time;
+      this.Parent = parent;
+    }
+
+    public Object GetValue { get; }
+    public DateTime UpdateTime { get; }
+    public Object Parent { get; private set; }
+  }
+  public class LightUpdateEvent : AllUpdateEvent {
+    public LightUpdateEvent() {
+    }
+
+    public LightUpdateEvent(Object value, DateTime time, Object parent) : base(value, time, parent) {
+    }
+  }
+  public class GroupUpdateEvent : AllUpdateEvent {
+    public GroupUpdateEvent() {
+    }
+
+    public GroupUpdateEvent(Object value, DateTime time, Object parent) : base(value, time, parent) {
+    }
+  }
+
+  public class SceneUpdateEvent : AllUpdateEvent {
+    public SceneUpdateEvent() {
+    }
+
+    public SceneUpdateEvent(Object value, DateTime time, Object parent) : base(value, time, parent) {
+    }
+  }
+  public class SensorUpdateEvent : AllUpdateEvent {
+    public SensorUpdateEvent() {
+    }
+
+    public SensorUpdateEvent(Object value, DateTime time, Object parent) : base(value, time, parent) {
+    }
+  }
+  public class ConfigUpdateEvent : AllUpdateEvent {
+    public ConfigUpdateEvent() {
+    }
+
+    public ConfigUpdateEvent(Object value, DateTime time, Object parent) : base(value, time, parent) {
+    }
+  }
+}
diff --git a/Hue/Hue/Exceptions/HueExceptions.cs b/Hue/Hue/Exceptions/HueExceptions.cs
new file mode 100644
index 0000000..bdeddf4
--- /dev/null
+++ b/Hue/Hue/Exceptions/HueExceptions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace BlubbFish.IoT.Hue.Exceptions {
+  [Serializable]
+  public class ConnectionException : Exception {
+    public ConnectionException() { }
+    public ConnectionException(String message) : base(message) { }
+    public ConnectionException(String message, Exception innerException) : base(message, innerException) { }
+    protected ConnectionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+  }
+}
diff --git a/Hue/Hue/Hue.csproj b/Hue/Hue/Hue.csproj
new file mode 100644
index 0000000..8f49671
--- /dev/null
+++ b/Hue/Hue/Hue.csproj
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{738A6137-8FCA-4CE1-BD1C-042B21B6B5F2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BlubbFish.IoT.Hue</RootNamespace>
+    <AssemblyName>Hue</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Devices\Configs\Config.cs" />
+    <Compile Include="Devices\Configs\Portalstate.cs" />
+    <Compile Include="Devices\Configs\SwUpdate.cs" />
+    <Compile Include="Devices\Configs\Whitelist.cs" />
+    <Compile Include="Devices\Scenes\LightState.cs" />
+    <Compile Include="Devices\Scenes\Scene.cs" />
+    <Compile Include="Devices\Sensors\Daylight.cs" />
+    <Compile Include="Interfaces\AConfig.cs" />
+    <Compile Include="Interfaces\AGroup.cs" />
+    <Compile Include="Devices\Groups\Room.cs" />
+    <Compile Include="Devices\Lights\Dimmablelight.cs" />
+    <Compile Include="Interfaces\ALight.cs" />
+    <Compile Include="Events\UpdateEvent.cs" />
+    <Compile Include="Exceptions\HueExceptions.cs" />
+    <Compile Include="Interfaces\AScene.cs" />
+    <Compile Include="Interfaces\AConnector.cs" />
+    <Compile Include="Interfaces\ASensor.cs" />
+    <Compile Include="Interfaces\IMqtt.cs" />
+    <Compile Include="HueController.cs" />
+    <Compile Include="lib\Helper.cs" />
+    <Compile Include="lib\HttpClient.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
+      <Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
+      <Name>litjson_4.7.1</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Hue/Hue/HueController.cs b/Hue/Hue/HueController.cs
new file mode 100644
index 0000000..2954ffb
--- /dev/null
+++ b/Hue/Hue/HueController.cs
@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.Exceptions;
+using BlubbFish.IoT.Hue.Interfaces;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue  {
+  public class HueController : IDisposable {
+    private Boolean polling;
+    private HttpConnection http;
+    private Thread updatethread;
+    private Thread pollthread;
+
+    public delegate void DataUpdate(Object sender, AllUpdateEvent e);
+    public event DataUpdate Update;
+
+    public ReadOnlyDictionary<Int32, ALight> Lights { get; private set; }
+    public ReadOnlyDictionary<Int32, AGroup> Groups { get; private set; }
+    public ReadOnlyDictionary<String, AScene> Scenes { get; private set; }
+    public ReadOnlyDictionary<Int32, ASensor> Sensors { get; private set; }
+    public AConfig Config { get; private set; }
+
+    public HueController(Dictionary<String,String> settings, Boolean enablePoll = true) {
+      this.polling = enablePoll;
+      if(!settings.ContainsKey("server")) {
+        throw new ArgumentException("Missing \"server\" in Configurationfile");
+      }
+      if(!settings.ContainsKey("key")) {
+        this.CreateKey(settings["server"]);
+        return;
+      }
+      this.Connect(settings["server"], settings["key"]);
+    }
+
+    private void Connect(String server, String key) {
+      this.http = new HttpConnection(server, key);
+      this.CreateAll(this.http.GetJson(""));
+      this.updatethread = new Thread(this.Updater);
+      this.updatethread.Start();
+      this.pollthread = new Thread(this.Poll);
+      this.pollthread.Start();
+      foreach (KeyValuePair<Int32, ALight> item in this.Lights) {
+        item.Value.Update += this.AllUpdate;
+      }
+      foreach (KeyValuePair<Int32, AGroup> item in this.Groups) {
+        item.Value.Update += this.AllUpdate;
+      }
+      foreach (KeyValuePair<String, AScene> item in this.Scenes) {
+        item.Value.Update += this.AllUpdate;
+      }
+      foreach (KeyValuePair<Int32, ASensor> item in this.Sensors) {
+        item.Value.Update += this.AllUpdate;
+      }
+      this.Config.Update += this.AllUpdate;
+    }
+
+    private void Poll() {
+      //throw new NotImplementedException();
+    }
+
+    public AConnector GetConnector(String type, String id) {
+      switch (type) {
+        case "sensor":
+          return this.Sensors.ContainsKey(Int32.Parse(id)) ? this.Sensors[Int32.Parse(id)] : null;
+        case "scene":
+          return this.Scenes.ContainsKey(id) ? this.Scenes[id] : null;
+        case "light":
+          return this.Lights.ContainsKey(Int32.Parse(id)) ? this.Lights[Int32.Parse(id)] : null;
+        case "group":
+          return this.Groups.ContainsKey(Int32.Parse(id)) ? this.Groups[Int32.Parse(id)] : null;
+        case "config":
+          return this.Config;
+      }
+      return null;
+    }
+
+    private void AllUpdate(Object sender, AllUpdateEvent e) {
+      this.Update?.Invoke(sender, e);
+    }
+
+    private void Updater() {
+      while (true) {
+        Thread.Sleep(1000 * 10); //Every Minute
+        JsonData update = this.http.GetJson("");
+        Helper.SetUpdate(this.Lights, update, "lights");
+        Helper.SetUpdate(this.Groups, update, "groups");
+        Helper.SetUpdate(this.Sensors, update, "sensors");
+        Helper.SetUpdate(this.Scenes, update, "scenes");
+        if (update.ContainsKey("config")) {
+          this.Config.SetUpdate(update);
+        }
+      }
+    }
+
+    
+
+    private void CreateAll(JsonData json) {
+      if(json.ContainsKey("lights")) {
+        this.Lights = new ReadOnlyDictionary<Int32, ALight>(this.CreateItemsInt32<ALight>(json["lights"], false));
+      }
+      if(json.ContainsKey("groups")) {
+        this.Groups = new ReadOnlyDictionary<Int32, AGroup>(this.CreateItemsInt32<AGroup>(json["groups"]));
+      }
+      if (json.ContainsKey("sensors")) {
+        this.Sensors = new ReadOnlyDictionary<Int32, ASensor>(this.CreateItemsInt32<ASensor>(json["sensors"], false));
+      }
+      if (json.ContainsKey("scenes")) {
+        this.CreateScenes(json["scenes"]);
+      }
+      if(json.ContainsKey("config")) {
+        this.Config = AConfig.CreateInstanceConcrete(json["config"], this.http, this.polling);
+      }
+    }
+
+    private Dictionary<Int32, T> CreateItemsInt32<T>(JsonData json, Boolean withLights = true) {
+      Dictionary<Int32, T> items = new Dictionary<Int32, T>();
+      foreach (String itemid in json.Keys) {
+        T item = default(T);
+        if (withLights) {
+          item = (T)AConnector.CreateInstance(typeof(T), json[itemid], new Tuple<Int32>(Int32.Parse(itemid)), this.http, this.polling, this.Lights);
+        } else {
+          item = (T)AConnector.CreateInstance(typeof(T), json[itemid], new Tuple<Int32>(Int32.Parse(itemid)), this.http, this.polling);
+        }
+        if(item != null) {
+          items.Add(Int32.Parse(itemid), item);
+        }
+      }
+      return items;
+    }
+
+    private void CreateScenes(JsonData json) {
+      Dictionary<String, AScene> scenes = new Dictionary<String, AScene>();
+      foreach (String sceneid in json.Keys) {
+        AScene s = AScene.CreateInstanceConcrete(json[sceneid], new Tuple<String>(sceneid), this.http, this.polling, this.Lights);
+        if (s != null) {
+          scenes.Add(sceneid, s);
+        }
+      }
+      this.Scenes = new ReadOnlyDictionary<String, AScene>(scenes);
+    }
+
+    private void CreateKey(String server) {
+      this.http = new HttpConnection(server);
+      JsonData json = this.http.PostJson("", "{\"devicetype\": \"Huelib#BlubbFish\"}");
+      if(json.IsArray && json[0].ContainsKey("error") && json[0]["error"].ContainsKey("type") && json[0]["error"]["type"].IsInt) {
+        if((Int32)json[0]["error"]["type"] == 101) {
+          Helper.WriteError("Please press the linkbutton on the Hue-Bridge! Then press return!");
+        }
+      }
+      Console.ReadLine();
+      json = this.http.PostJson("", "{\"devicetype\": \"Huelib#BlubbFish\"}");
+      String key = "";
+      if(json.IsArray && json[0].ContainsKey("success") && json[0]["success"].ContainsKey("username") && json[0]["success"]["username"].IsString) {
+        key = json[0]["success"]["username"].ToString();
+      }
+      Helper.WriteError("Create \"key\" in config file! key=" + key);
+      throw new ConnectionException("Create \"key\" in config file! key=" + key);
+    }
+
+
+    
+
+    #region IDisposable Support
+    private Boolean disposedValue = false;
+
+    protected virtual void Dispose(Boolean disposing) {
+      if (!this.disposedValue) {
+        if (disposing) {
+          this.updatethread.Abort();
+          this.pollthread.Abort();
+        }
+        this.updatethread = null;
+        this.pollthread = null;
+        this.Lights = null;
+        this.Groups = null;
+        this.Scenes = null;
+        this.Sensors = null;
+        this.Config = null;
+        this.disposedValue = true;
+      }
+    }
+
+    public void Dispose() {
+      Dispose(true);
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/AConfig.cs b/Hue/Hue/Interfaces/AConfig.cs
new file mode 100644
index 0000000..6dd9ffe
--- /dev/null
+++ b/Hue/Hue/Interfaces/AConfig.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Hue.Devices.Configs;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class AConfig : AConnector, IMqtt {
+    #region Constructor
+    public AConfig(JsonData json, HttpConnection http, Boolean polling) : base(http, polling){
+    }
+
+    internal static AConfig CreateInstanceConcrete(JsonData json, HttpConnection http, Boolean polling) {
+      return new Config(json, http, polling);
+    }
+    #endregion
+
+    protected Boolean SetConfig(Dictionary<String, Object> dictionary) {
+      return this.PutDictionary("config", dictionary);
+    }
+
+    #region IMqtt
+    public String MqttTopic() {
+      return "config";
+    }
+    public String ToJson() {
+      return JsonMapper.ToJson(this.ToDictionary());
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/AConnector.cs b/Hue/Hue/Interfaces/AConnector.cs
new file mode 100644
index 0000000..4197e3a
--- /dev/null
+++ b/Hue/Hue/Interfaces/AConnector.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class AConnector {
+    protected HttpConnection http;
+    public delegate void UpdatedValue(Object sender, AllUpdateEvent e);
+    public event UpdatedValue Update;
+
+    #region Properties
+    public DateTime LastUpdate { get; private set; }
+    public Boolean Polling { get; set; }
+    public Boolean PollOnce { get; set; }
+    #endregion
+
+    #region Constructor
+    public AConnector(HttpConnection http, Boolean polling) {
+      this.http = http;
+      this.Polling = polling;
+      this.LastUpdate = DateTime.Now;
+    }
+
+    internal static Object CreateInstance(Type type, JsonData json, Tuple<Int32> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) {
+      return type.GetMethod("CreateInstanceConcrete", new Type[] { typeof(JsonData), typeof(Tuple<Int32>), typeof(HttpConnection), typeof(Boolean), typeof(ReadOnlyDictionary<Int32, ALight>) }).Invoke(null, new Object[] { json, id, http, polling, lights });
+    }
+
+    internal static Object CreateInstance(Type type, JsonData json, Tuple<Int32> id, HttpConnection http, Boolean polling) {
+      return type.GetMethod("CreateInstanceConcrete", new Type[] { typeof(JsonData), typeof(Tuple<Int32>), typeof(HttpConnection), typeof(Boolean) }).Invoke(null, new Object[] { json, id, http, polling });
+    }
+    #endregion
+
+    protected Boolean PutDictionary(String address, Dictionary<String, Object> value) {
+      JsonData json = this.http.PutJson(address, JsonMapper.ToJson(value));
+      if (json.IsArray) {
+        return json[0].ContainsKey("success");
+      }
+      return false;
+    }
+
+    public virtual Dictionary<String, Object> ToDictionary() {
+      Dictionary<String, Object> dictionary = new Dictionary<String, Object>();
+      foreach (PropertyInfo item in this.GetType().GetProperties()) {
+        if (item.CanRead && item.GetValue(this) != null) {
+          if (item.GetValue(this).GetType().GetMethod("ToDictionary") != null) {
+            dictionary.Add(item.Name, item.GetValue(this).GetType().GetMethod("ToDictionary").Invoke(item.GetValue(this), null));
+          } else if (Helper.HasInterface(item.GetValue(this).GetType(), "IDictionary")) {
+            Dictionary<String, Object> subdict = new Dictionary<String, Object>();
+            foreach (DictionaryEntry subitem in (IDictionary)item.GetValue(this)) {
+              if (subitem.Value.GetType().GetMethod("ToDictionary") != null) {
+                subdict.Add(subitem.Key.ToString(), subitem.Value.GetType().GetMethod("ToDictionary").Invoke(subitem.Value, null));
+              }
+            }
+            dictionary.Add(item.Name, subdict);
+          } else if (item.GetValue(this).GetType().BaseType == typeof(Enum)) {
+            dictionary.Add(item.Name, Helper.GetEnumDescription((Enum)item.GetValue(this)));
+          } else {
+            dictionary.Add(item.Name, item.GetValue(this));
+          }
+        }
+      }
+      return dictionary;
+    }
+
+    protected void NotifyClient<T>(Object value) {
+      this.LastUpdate = DateTime.Now;
+      this.Update?.Invoke(this, (AllUpdateEvent)Activator.CreateInstance(typeof(T), new Object[] { value, this.LastUpdate, this }));
+    }
+
+    protected void NotifyClientChildren(Object sender, AllUpdateEvent e) {
+      this.Update?.Invoke(sender, e);
+    }
+
+    #region Abstracts
+    public abstract override String ToString();
+    public abstract void SetUpdate(JsonData json);
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/AGroup.cs b/Hue/Hue/Interfaces/AGroup.cs
new file mode 100644
index 0000000..dbc2e6b
--- /dev/null
+++ b/Hue/Hue/Interfaces/AGroup.cs
@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class AGroup : AConnector, IMqtt {
+    protected String _name;
+    protected GroupClass _class;
+
+    public enum GroupClass {
+      [Description("Living room")]
+      Livingroom,
+      Kitchen,
+      Dining,
+      Bedroom,
+      [Description("Kids bedroom")]
+      Kidsbedroom,
+      Bathroom,
+      Nursery,
+      Recreation,
+      Office,
+      Gym,
+      Hallway,
+      Toilet,
+      [Description("Front door")]
+      Frontdoor,
+      Garage,
+      Terrace,
+      Garden,
+      Driveway,
+      Carport,
+      Other
+    }
+    public enum Types {
+      Room
+    }
+    public enum TypesIgnore {
+      Luminaire,
+      Lightsource,
+      LightGroup,
+      Entertainment
+    }
+
+    #region Properties
+    public String Name { get {
+        return this._name;
+      } set {
+        if(this.SetGroupAttribute(new Dictionary<String, Object>() { { "name", value } })) {
+          this._name = value;
+          this.NotifyClient<GroupUpdateEvent>(value);
+        }
+      }
+    }
+    public Int32 GroupId { get; }
+    public Types Groupclass { get; }
+    public Boolean StateAnyOn { get; protected set; }
+    public Boolean StateAllOn { get; protected set; }
+    public ReadOnlyDictionary<Int32, ALight> Lights { get; protected set; }
+    public GroupClass Class {
+      get {
+        return this._class;
+      }
+      set {
+        if(this.SetGroupAttribute(new Dictionary<String, Object>() { { "class", Helper.GetEnumDescription(value) } })) {
+          this._class = value;
+          this.NotifyClient<GroupUpdateEvent>(value);
+        }
+      }
+    }
+    #endregion
+
+    #region Constructor
+    protected AGroup(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) : base(http, polling) {
+      this.GroupId = id.Item1;
+      this.Groupclass = id.Item2;
+      this.ComplexInit(json, lights);
+    }
+
+    private void ComplexInit(JsonData json, ReadOnlyDictionary<Int32, ALight> lights) {
+      if (json.ContainsKey("lights") && json["lights"].IsArray) {
+        Dictionary<Int32, ALight> lightdict = new Dictionary<Int32, ALight>();
+        foreach (JsonData item in json["lights"]) {
+          if (Int32.TryParse(item.ToString(), out Int32 lampid)) {
+            if (lights.ContainsKey(lampid)) {
+              lightdict.Add(lampid, lights[lampid]);
+            }
+          }
+        }
+        this.Lights = new ReadOnlyDictionary<Int32, ALight>(lightdict);
+      }
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        this._name = json["name"].ToString();
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("any_on") && json["state"]["any_on"].IsBoolean) {
+        this.StateAnyOn = (Boolean)json["state"]["any_on"];
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("all_on") && json["state"]["all_on"].IsBoolean) {
+        this.StateAllOn = (Boolean)json["state"]["all_on"];
+      }
+      if (json.ContainsKey("class") && json["class"].IsString) {
+        this._class = (GroupClass)Enum.Parse(typeof(GroupClass), json["class"].ToString().ToEnumString());
+      }
+    }
+
+    public static AGroup CreateInstanceConcrete(JsonData json, Tuple<Int32> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) {
+      String type = "";
+      if (json.ContainsKey("type")) {
+        type = json["type"].ToString().ToEnumString();
+      }
+      if (type != "" && !Enum.IsDefined(typeof(TypesIgnore), type) && Enum.IsDefined(typeof(Types), type)) {
+        String name = "BlubbFish.IoT.Hue.Devices.Groups." + type;
+        return GetInstanceConcrete(name, json, new Tuple<Int32, Types>(id.Item1, (Types)Enum.Parse(typeof(Types), type)), http, polling, lights);
+      }
+      if (!Enum.IsDefined(typeof(TypesIgnore), type) && !Enum.IsDefined(typeof(Types), type)) {
+        Helper.WriteError("Lightclass " + type + " not exist.");
+      }
+      return null;
+    }
+
+    private static AGroup GetInstanceConcrete(String name, JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) {
+      Type t = null;
+      try {
+        t = Type.GetType(name, true);
+      } catch (TypeLoadException) {
+        Helper.WriteError("Konnte Type " + name + " nicht laden!");
+        return null;
+      }
+      return (AGroup)t.GetConstructor(new Type[] { typeof(JsonData), typeof(Tuple<Int32, Types>), typeof(HttpConnection), typeof(Boolean), typeof(ReadOnlyDictionary<Int32, ALight>) }).Invoke(new Object[] { json, id, http, polling, lights });
+    }
+    #endregion
+
+    protected Boolean SetGroupAttribute(Dictionary<String, Object> value) {
+      return this.PutDictionary("groups/" + this.GroupId, value);
+    }
+
+    protected Boolean SetGroupAction(Dictionary<String, Object> value) {
+      return this.PutDictionary("groups/" + this.GroupId + "/action", value);
+    }
+
+    #region AConnector
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        if (this.Name != json["name"].ToString()) {
+          this._name = json["name"].ToString();
+          this.NotifyClient<GroupUpdateEvent>(this.Name);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("any_on") && json["state"]["any_on"].IsBoolean) {
+        if (this.StateAnyOn != (Boolean)json["state"]["any_on"]) {
+          this.StateAnyOn = (Boolean)json["state"]["any_on"];
+          this.NotifyClient<GroupUpdateEvent>(this.StateAnyOn);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("all_on") && json["state"]["all_on"].IsBoolean) {
+        if (this.StateAllOn != (Boolean)json["state"]["all_on"]) {
+          this.StateAllOn = (Boolean)json["state"]["all_on"];
+          this.NotifyClient<GroupUpdateEvent>(this.StateAllOn);
+        }
+      }
+      if (json.ContainsKey("class") && json["class"].IsString) {
+        if (this.Class != (GroupClass)Enum.Parse(typeof(GroupClass), json["class"].ToString().ToEnumString())) {
+          this._class = (GroupClass)Enum.Parse(typeof(GroupClass), json["class"].ToString().ToEnumString());
+          this.NotifyClient<GroupUpdateEvent>(this.Class);
+        }
+      }
+    }
+    #endregion
+
+    #region IMqtt
+    public String ToJson() {
+      return JsonMapper.ToJson(this.ToDictionary());    
+    }
+
+    public String MqttTopic() {
+      return "group/" + this.GroupId;
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/ALight.cs b/Hue/Hue/Interfaces/ALight.cs
new file mode 100644
index 0000000..e5b461b
--- /dev/null
+++ b/Hue/Hue/Interfaces/ALight.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class ALight : AConnector, IMqtt {
+    public enum Types {
+      Dimmablelight
+    }
+    public enum TypesIgnore {
+      Colorlight,
+      Extendedcolorlight
+    }
+
+    #region Properties
+    public Int32 LightId { get; }
+    public Types Lightclass { get; }
+    private String _name;
+    public String Name {
+      get {
+        return this._name;
+      }
+      set {
+        if (this.SetLightAttribute(new Dictionary<String, Object>() { { "name", value } })) {
+          this._name = value;
+          this.NotifyClient<LightUpdateEvent>(value);
+        }
+      }
+    }
+    #endregion
+
+    #region Constructor
+    protected ALight(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling): base(http, polling) {
+      this.LightId = id.Item1;
+      this.Lightclass = id.Item2;
+      this.ComplexInit(json);
+    }
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("name")) {
+        this._name = json["name"].ToString();
+      }
+    }
+
+    public static ALight CreateInstanceConcrete(JsonData json, Tuple<Int32> id, HttpConnection http, Boolean polling) {
+      String type = "";
+      if (json.ContainsKey("type")) {
+        type = json["type"].ToString().ToEnumString();
+      }
+      if (type != "" && !Enum.IsDefined(typeof(TypesIgnore), type) && Enum.IsDefined(typeof(Types), type)) {
+        String name = "BlubbFish.IoT.Hue.Devices.Lights." + type;
+        return GetInstanceConcrete(name, json, new Tuple<Int32, Types>(id.Item1, (Types)Enum.Parse(typeof(Types), type)), http, polling);
+      }
+      if(!Enum.IsDefined(typeof(TypesIgnore), type) && !Enum.IsDefined(typeof(Types), type)) {
+        Helper.WriteError("Lightclass " + type + " not exist.");
+      }
+      return null;
+    }
+
+    private static ALight GetInstanceConcrete(String name, JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling) {
+      Type t = null;
+      try {
+        t = Type.GetType(name, true);
+      } catch (TypeLoadException) {
+        Helper.WriteError("Konnte Type " + name + " nicht laden!");
+        return null;
+      }
+      return (ALight)t.GetConstructor(new Type[] { typeof(JsonData), typeof(Tuple<Int32, Types>), typeof(HttpConnection), typeof(Boolean) }).Invoke(new Object[] { json, id, http, polling });
+    }
+    #endregion
+
+    protected Boolean SetLightStateAttribute(Dictionary<String, Object> value) {
+      return this.PutDictionary("lights/" + this.LightId + "/state", value);
+    }
+    protected Boolean SetLightAttribute(Dictionary<String, Object> value) {
+      return this.PutDictionary("lights/" + this.LightId, value);
+    }
+
+    #region IMqtt
+    public String MqttTopic() {
+      return "light/" + this.LightId;
+    }
+
+    public String ToJson() {
+      return JsonMapper.ToJson(this.ToDictionary());
+    }
+    #endregion
+
+    #region AConnector
+    public override void SetUpdate(JsonData json) {
+      if(json.ContainsKey("name") && json["name"].IsString) {
+        if(this.Name != json["name"].ToString()) {
+          this._name = json["name"].ToString();
+          this.NotifyClient<LightUpdateEvent>(this.Name);
+        }
+      }
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/AScene.cs b/Hue/Hue/Interfaces/AScene.cs
new file mode 100644
index 0000000..cbbb104
--- /dev/null
+++ b/Hue/Hue/Interfaces/AScene.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using BlubbFish.IoT.Hue.Devices.Scenes;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class AScene : AConnector, IMqtt {
+    #region Properties
+    public String SceneId { get; }
+    public Int32 LightStateId { get; }
+    #endregion
+
+    #region Constructor
+    protected AScene(JsonData json, Tuple<String, Int32> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) : base(http, polling) {
+      this.SceneId = id.Item1;
+      this.LightStateId = id.Item2;
+    }
+
+    public static AScene CreateInstanceConcrete(JsonData json, Tuple<String> id, HttpConnection http, Boolean polling, ReadOnlyDictionary<Int32, ALight> lights) {
+      return new Scene(http.GetJson("scenes/" + id.Item1), id, http, polling, lights);
+    }
+    #endregion
+
+    protected Boolean SetSceneAttribute(Dictionary<String, Object> dictionary) {
+      return this.PutDictionary("scenes/" + this.SceneId, dictionary);
+    }
+    protected Boolean SetLightSceneAttribute(Dictionary<String, Object> value) {
+      return this.PutDictionary("scenes/" + this.SceneId + "/lights/" + this.LightStateId + "/state", value);
+    }
+
+    #region IMqtt
+    public String ToJson() {
+      return JsonMapper.ToJson(this.ToDictionary());
+    }
+
+    public String MqttTopic() {
+      return "scene/" + this.SceneId;
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/ASensor.cs b/Hue/Hue/Interfaces/ASensor.cs
new file mode 100644
index 0000000..63cfd4a
--- /dev/null
+++ b/Hue/Hue/Interfaces/ASensor.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using BlubbFish.IoT.Hue.Events;
+using BlubbFish.IoT.Hue.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public abstract class ASensor : AConnector, IMqtt {
+    public enum Types {
+      Daylight
+    }
+    public enum TypesIgnore {
+      Zgpswitch,
+      Zllswitch,
+      Zllpresence,
+      Zlltemperature,
+      Clipswitch,
+      Clipopenclose,
+      Clippresence,
+      Cliptemperature,
+      Cliphumidity,
+      Cliplightlevel,
+      Zlllightlevel,
+      Clipgenericflag,
+      Clipgenericstatus
+    }
+
+    #region Properties
+    public Int32 SensorId { get; }
+    public Types Sensorclass { get; }
+    public DateTime Lastupdated { get; protected set; }
+    private String _name;
+    public String Name {
+      get {
+        return this._name;
+      }
+      set {
+        this._name = value;
+        this.SetSensorAttribute(new Dictionary<String, Object>() { { "name", value } });
+      }
+    }
+    #endregion
+
+    #region Constructor
+    protected ASensor(JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling) : base(http, polling) {
+      this.SensorId = id.Item1;
+      this.Sensorclass = id.Item2;
+      this.ComplexInit(json);
+    }
+
+    private void ComplexInit(JsonData json) {
+      if (json.ContainsKey("name")) {
+        this._name = json["name"].ToString();
+      }
+      if (json.ContainsKey("state")) {
+        JsonData state = json["state"];
+        if (state.ContainsKey("lastupdated") && state["lastupdated"].IsString) {
+          this.Lastupdated = DateTime.Parse(state["lastupdated"].ToString());
+        }
+      }
+    }
+
+    public static ASensor CreateInstanceConcrete(JsonData json, Tuple<Int32> id, HttpConnection http, Boolean polling) {
+      String type = "";
+      if (json.ContainsKey("type")) {
+        type = json["type"].ToString().ToEnumString();
+      }
+      if (type != "" && !Enum.IsDefined(typeof(TypesIgnore), type) && Enum.IsDefined(typeof(Types), type)) {
+        String name = "BlubbFish.IoT.Hue.Devices.Sensors." + type;
+        return GetInstanceConcrete(name, json, new Tuple<Int32, Types>(id.Item1, (Types)Enum.Parse(typeof(Types), type)), http, polling);
+      }
+      if (!Enum.IsDefined(typeof(TypesIgnore), type) && !Enum.IsDefined(typeof(Types), type)) {
+        Helper.WriteError("Sensorclass " + type + " not exist.");
+      }
+      return null;
+    }
+
+    private static ASensor GetInstanceConcrete(String name, JsonData json, Tuple<Int32, Types> id, HttpConnection http, Boolean polling) {
+      Type t = null;
+      try {
+        t = Type.GetType(name, true);
+      } catch (TypeLoadException) {
+        Helper.WriteError("Konnte Type " + name + " nicht laden!");
+        return null;
+      }
+      return (ASensor)t.GetConstructor(new Type[] { typeof(JsonData), typeof(Tuple<Int32, Types>), typeof(HttpConnection), typeof(Boolean) }).Invoke(new Object[] { json, id, http, polling });
+    }
+    #endregion
+
+    protected void SetSensorAttribute(Dictionary<String, Object> dictionary) {
+      this.PutDictionary("sensors/" + this.SensorId, dictionary);
+    }
+
+    protected Boolean SetSensorConfig(Dictionary<String, Object> dictionary) {
+      return this.PutDictionary("sensors/" + this.SensorId + "/config", dictionary);
+    }
+
+    #region AConnector
+    public override void SetUpdate(JsonData json) {
+      if (json.ContainsKey("name") && json["name"].IsString) {
+        if (this.Name != json["name"].ToString()) {
+          this._name = json["name"].ToString();
+          this.NotifyClient<SensorUpdateEvent>(this.Name);
+        }
+      }
+      if (json.ContainsKey("state") && json["state"].ContainsKey("lastupdated") && json["state"]["lastupdated"].IsString) {
+        if (this.Lastupdated != DateTime.Parse(json["state"]["lastupdated"].ToString())) {
+          this.Lastupdated = DateTime.Parse(json["state"]["lastupdated"].ToString());
+          this.NotifyClient<SensorUpdateEvent>(this.Lastupdated);
+        }
+      }
+    }
+    #endregion
+
+    #region IMqtt
+    public String MqttTopic() {
+      return "sensor/" + this.SensorId;
+    }
+
+    public String ToJson() {
+      return JsonMapper.ToJson(this.ToDictionary());
+    }
+    #endregion
+  }
+}
diff --git a/Hue/Hue/Interfaces/IMqtt.cs b/Hue/Hue/Interfaces/IMqtt.cs
new file mode 100644
index 0000000..80b1023
--- /dev/null
+++ b/Hue/Hue/Interfaces/IMqtt.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlubbFish.IoT.Hue.Interfaces {
+  public interface IMqtt {
+    /// <summary>
+    /// Gibt einen JSON-String der Eigenschaften eines Objekts zurück
+    /// </summary>
+    /// <returns>JSON-String</returns>
+    String ToJson();
+    /// <summary>
+    /// Gibt das MQTT-Topic als String zurück unter dem die Daten des Objekts Publiziert werden sollen
+    /// </summary>
+    /// <returns>MQTT-Topic</returns>
+    String MqttTopic();
+  }
+}
diff --git a/Hue/Hue/Properties/AssemblyInfo.cs b/Hue/Hue/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..886f51e
--- /dev/null
+++ b/Hue/Hue/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("Hue")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Hue")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("738a6137-8fca-4ce1-bd1c-042b21b6b5f2")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Hue/Hue/bin/Release/Hue.dll b/Hue/Hue/bin/Release/Hue.dll
new file mode 100644
index 0000000..30deab9
Binary files /dev/null and b/Hue/Hue/bin/Release/Hue.dll differ
diff --git a/Hue/Hue/bin/Release/litjson.dll b/Hue/Hue/bin/Release/litjson.dll
new file mode 100644
index 0000000..d2229a7
Binary files /dev/null and b/Hue/Hue/bin/Release/litjson.dll differ
diff --git a/Hue/Hue/lib/Helper.cs b/Hue/Hue/lib/Helper.cs
new file mode 100644
index 0000000..1150edb
--- /dev/null
+++ b/Hue/Hue/lib/Helper.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Reflection;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.lib {
+  class Helper {
+    internal static void WriteError(String text) {
+      Console.ForegroundColor = ConsoleColor.Red;
+      Console.Error.WriteLine("ERROR: " + text);
+      Console.ResetColor();
+    }
+    public static String GetEnumDescription(Enum value) {
+      FieldInfo fi = value.GetType().GetField(value.ToString());
+
+      DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
+
+      if (attributes != null && attributes.Length > 0) {
+        return attributes[0].Description;
+      } else {
+        return value.ToString();
+      }
+    }
+    internal static Boolean HasInterface(Type o, String type) {
+      foreach (Type item in o.GetInterfaces()) {
+        if (item.Name == type) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    public static void SetUpdate<T>(ReadOnlyDictionary<Int32, T> list, JsonData json, String key) {
+      if (json.ContainsKey(key)) {
+        foreach (String item in json[key].Keys) {
+          if (list.ContainsKey(Int32.Parse(item))) {
+            list[Int32.Parse(item)].GetType().GetMethod("SetUpdate").Invoke(list[Int32.Parse(item)], new Object[] { json[key][item] });
+          }
+        }
+      }
+    }
+
+    public static void SetUpdate<T>(ReadOnlyDictionary<String, T> list, JsonData json, String key) {
+      if (json.ContainsKey(key)) {
+        foreach (String item in json[key].Keys) {
+          if (list.ContainsKey(item)) {
+            list[item].GetType().GetMethod("SetUpdate").Invoke(list[item], new Object[] { json[key][item] });
+          }
+        }
+      }
+    }
+  }
+  public static class StringHelper {
+    public static String ToEnumString(this String text) {
+      if(text.Length == 0) {
+        return text;
+      }
+      if(text.Length == 1) {
+        return text.ToUpper();
+      }
+      text = text.Replace(" ", "");
+      text = text.ToLower();
+      return text[0].ToString().ToUpper() + text.Substring(1);
+    }
+  }
+}
diff --git a/Hue/Hue/lib/HttpClient.cs b/Hue/Hue/lib/HttpClient.cs
new file mode 100644
index 0000000..9092f8e
--- /dev/null
+++ b/Hue/Hue/lib/HttpClient.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using LitJson;
+
+namespace BlubbFish.IoT.Hue.lib {
+  public class HttpConnection {
+    private String server;
+    private Object getLock = new Object();
+    private enum RequestMethod {
+      GET,
+      POST,
+      PUT
+    }
+
+    public HttpConnection(String server) {
+      this.server = "http://" + server + "/api/";
+      this.Init(false);
+    }
+
+    public HttpConnection(String server, String key) {
+      this.server = "http://" + server + "/api/" + key + "/";
+      this.Init(true);
+    }
+
+    private void Init(Boolean withuser = true) {
+      this.RequestString("config", "", false);
+      if(withuser) {
+        String i = this.RequestString("", "", false);
+      }
+    }
+
+    
+
+    internal JsonData PostJson(String address, String json) {
+      return this.ToJson(this.RequestString(address, json, true, RequestMethod.POST));
+    }
+
+    internal JsonData PutJson(String address, String json) {
+      return this.ToJson(this.RequestString(address, json, true, RequestMethod.PUT));
+    }
+
+    internal JsonData GetJson(String address) {
+      return this.ToJson(this.RequestString(address));
+    }
+
+    private JsonData ToJson(String text) {
+      if (text == null) {
+        return new JsonData();
+      }
+      try {
+        return JsonMapper.ToObject(text);
+      } catch (Exception) {
+        return new JsonData();
+      }
+    }
+
+    private String RequestString(String address, String json = "", Boolean withoutput = true, RequestMethod method = RequestMethod.GET) {
+      String ret = null;
+      lock (this.getLock) {
+        HttpWebRequest request = WebRequest.CreateHttp(this.server + address);
+        request.Timeout = 5000;
+        if(method == RequestMethod.POST || method == RequestMethod.PUT) {
+          Byte[] requestdata = Encoding.ASCII.GetBytes(json);
+          request.ContentLength = requestdata.Length;
+          request.Method = method.ToString();
+          request.ContentType = "application/x-www-form-urlencoded";
+          using (Stream stream = request.GetRequestStream()) {
+            stream.Write(requestdata, 0, requestdata.Length);
+          }
+        }
+        try {
+          using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
+            if (response.StatusCode == HttpStatusCode.Unauthorized) {
+              Console.Error.WriteLine("Benutzer oder Passwort falsch!");
+              throw new Exceptions.ConnectionException("Benutzer oder Passwort falsch!");
+            }
+            if (withoutput) {
+              StreamReader reader = new StreamReader(response.GetResponseStream());
+              ret = reader.ReadToEnd();
+            }
+          }
+        } catch (Exception e) {
+          Helper.WriteError("Konnte keine Verbindung zum Razzbery Server herstellen. Resource: \"" + this.server + address + "\" Fehler: " + e.Message);
+          return null;
+          //throw new Exceptions.ConnectionException("Konnte keine Verbindung zum Razzbery Server herstellen: " + e.Message);
+        }
+      }
+      return ret;
+    }
+  }
+}
diff --git a/Librarys/litjson/litjson.sln b/Librarys/litjson/litjson.sln
new file mode 100644
index 0000000..ca51522
--- /dev/null
+++ b/Librarys/litjson/litjson.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AF2398AC-1EAA-4615-B21A-33C68CD44849}
+	EndGlobalSection
+EndGlobal
diff --git a/Librarys/litjson/litjson/IJsonWrapper.cs b/Librarys/litjson/litjson/IJsonWrapper.cs
new file mode 100644
index 0000000..9b7e2d1
--- /dev/null
+++ b/Librarys/litjson/litjson/IJsonWrapper.cs
@@ -0,0 +1,60 @@
+#region Header
+/**
+ * IJsonWrapper.cs
+ *   Interface that represents a type capable of handling all kinds of JSON
+ *   data. This is mainly used when mapping objects through JsonMapper, and
+ *   it's implemented by JsonData.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System.Collections;
+using System.Collections.Specialized;
+
+
+namespace LitJson
+{
+    public enum JsonType
+    {
+        None,
+
+        Object,
+        Array,
+        String,
+        Int,
+        Long,
+        Double,
+        Boolean
+    }
+
+    public interface IJsonWrapper : IList, IOrderedDictionary
+    {
+        bool IsArray   { get; }
+        bool IsBoolean { get; }
+        bool IsDouble  { get; }
+        bool IsInt     { get; }
+        bool IsLong    { get; }
+        bool IsObject  { get; }
+        bool IsString  { get; }
+
+        bool     GetBoolean ();
+        double   GetDouble ();
+        int      GetInt ();
+        JsonType GetJsonType ();
+        long     GetLong ();
+        string   GetString ();
+
+        void SetBoolean  (bool val);
+        void SetDouble   (double val);
+        void SetInt      (int val);
+        void SetJsonType (JsonType type);
+        void SetLong     (long val);
+        void SetString   (string val);
+
+        string ToJson ();
+        void   ToJson (JsonWriter writer);
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonData.cs b/Librarys/litjson/litjson/JsonData.cs
new file mode 100644
index 0000000..aa70897
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonData.cs
@@ -0,0 +1,1012 @@
+#region Header
+/**
+ * JsonData.cs
+ *   Generic type to hold JSON data (objects, arrays, and so on). This is
+ *   the default type returned by JsonMapper.ToObject().
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+
+
+namespace LitJson
+{
+    public class JsonData : IJsonWrapper, IEquatable<JsonData>
+    {
+        #region Fields
+        private IList<JsonData>               inst_array;
+        private bool                          inst_boolean;
+        private double                        inst_double;
+        private int                           inst_int;
+        private long                          inst_long;
+        private IDictionary<string, JsonData> inst_object;
+        private string                        inst_string;
+        private string                        json;
+        private JsonType                      type;
+
+        // Used to implement the IOrderedDictionary interface
+        private IList<KeyValuePair<string, JsonData>> object_list;
+        #endregion
+
+
+        #region Properties
+        public int Count {
+            get { return EnsureCollection ().Count; }
+        }
+
+        public bool IsArray {
+            get { return type == JsonType.Array; }
+        }
+
+        public bool IsBoolean {
+            get { return type == JsonType.Boolean; }
+        }
+
+        public bool IsDouble {
+            get { return type == JsonType.Double; }
+        }
+
+        public bool IsInt {
+            get { return type == JsonType.Int; }
+        }
+
+        public bool IsLong {
+            get { return type == JsonType.Long; }
+        }
+
+        public bool IsObject {
+            get { return type == JsonType.Object; }
+        }
+
+        public bool IsString {
+            get { return type == JsonType.String; }
+        }
+
+        public ICollection<string> Keys {
+            get { EnsureDictionary (); return inst_object.Keys; }
+        }   
+    /// <summary>
+    /// Determines whether the dictionary contains an element that has the specified key.
+    /// </summary>
+    /// <param name="key">The key to locate in the dictionary.</param>
+    /// <returns>true if the dictionary contains an element that has the specified key; otherwise, false.</returns>
+    public Boolean ContainsKey(String key) {
+      EnsureDictionary();
+      return this.inst_object.Keys.Contains(key);
+    }
+    #endregion
+
+
+    #region ICollection Properties
+    int ICollection.Count {
+            get {
+                return Count;
+            }
+        }
+
+        bool ICollection.IsSynchronized {
+            get {
+                return EnsureCollection ().IsSynchronized;
+            }
+        }
+
+        object ICollection.SyncRoot {
+            get {
+                return EnsureCollection ().SyncRoot;
+            }
+        }
+        #endregion
+
+
+        #region IDictionary Properties
+        bool IDictionary.IsFixedSize {
+            get {
+                return EnsureDictionary ().IsFixedSize;
+            }
+        }
+
+        bool IDictionary.IsReadOnly {
+            get {
+                return EnsureDictionary ().IsReadOnly;
+            }
+        }
+
+        ICollection IDictionary.Keys {
+            get {
+                EnsureDictionary ();
+                IList<string> keys = new List<string> ();
+
+                foreach (KeyValuePair<string, JsonData> entry in
+                         object_list) {
+                    keys.Add (entry.Key);
+                }
+
+                return (ICollection) keys;
+            }
+        }
+
+        ICollection IDictionary.Values {
+            get {
+                EnsureDictionary ();
+                IList<JsonData> values = new List<JsonData> ();
+
+                foreach (KeyValuePair<string, JsonData> entry in
+                         object_list) {
+                    values.Add (entry.Value);
+                }
+
+                return (ICollection) values;
+            }
+        }
+        #endregion
+
+
+
+        #region IJsonWrapper Properties
+        bool IJsonWrapper.IsArray {
+            get { return IsArray; }
+        }
+
+        bool IJsonWrapper.IsBoolean {
+            get { return IsBoolean; }
+        }
+
+        bool IJsonWrapper.IsDouble {
+            get { return IsDouble; }
+        }
+
+        bool IJsonWrapper.IsInt {
+            get { return IsInt; }
+        }
+
+        bool IJsonWrapper.IsLong {
+            get { return IsLong; }
+        }
+
+        bool IJsonWrapper.IsObject {
+            get { return IsObject; }
+        }
+
+        bool IJsonWrapper.IsString {
+            get { return IsString; }
+        }
+        #endregion
+
+
+        #region IList Properties
+        bool IList.IsFixedSize {
+            get {
+                return EnsureList ().IsFixedSize;
+            }
+        }
+
+        bool IList.IsReadOnly {
+            get {
+                return EnsureList ().IsReadOnly;
+            }
+        }
+        #endregion
+
+
+        #region IDictionary Indexer
+        object IDictionary.this[object key] {
+            get {
+                return EnsureDictionary ()[key];
+            }
+
+            set {
+                if (! (key is String))
+                    throw new ArgumentException (
+                        "The key has to be a string");
+
+                JsonData data = ToJsonData (value);
+
+                this[(string) key] = data;
+            }
+        }
+        #endregion
+
+
+        #region IOrderedDictionary Indexer
+        object IOrderedDictionary.this[int idx] {
+            get {
+                EnsureDictionary ();
+                return object_list[idx].Value;
+            }
+
+            set {
+                EnsureDictionary ();
+                JsonData data = ToJsonData (value);
+
+                KeyValuePair<string, JsonData> old_entry = object_list[idx];
+
+                inst_object[old_entry.Key] = data;
+
+                KeyValuePair<string, JsonData> entry =
+                    new KeyValuePair<string, JsonData> (old_entry.Key, data);
+
+                object_list[idx] = entry;
+            }
+        }
+        #endregion
+
+
+        #region IList Indexer
+        object IList.this[int index] {
+            get {
+                return EnsureList ()[index];
+            }
+
+            set {
+                EnsureList ();
+                JsonData data = ToJsonData (value);
+
+                this[index] = data;
+            }
+        }
+        #endregion
+
+
+        #region Public Indexers
+        public JsonData this[string prop_name] {
+            get {
+                EnsureDictionary ();
+                return inst_object[prop_name];
+            }
+
+            set {
+                EnsureDictionary ();
+
+                KeyValuePair<string, JsonData> entry =
+                    new KeyValuePair<string, JsonData> (prop_name, value);
+
+                if (inst_object.ContainsKey (prop_name)) {
+                    for (int i = 0; i < object_list.Count; i++) {
+                        if (object_list[i].Key == prop_name) {
+                            object_list[i] = entry;
+                            break;
+                        }
+                    }
+                } else
+                    object_list.Add (entry);
+
+                inst_object[prop_name] = value;
+
+                json = null;
+            }
+        }
+
+        public JsonData this[int index] {
+            get {
+                EnsureCollection ();
+
+                if (type == JsonType.Array)
+                    return inst_array[index];
+
+                return object_list[index].Value;
+            }
+
+            set {
+                EnsureCollection ();
+
+                if (type == JsonType.Array)
+                    inst_array[index] = value;
+                else {
+                    KeyValuePair<string, JsonData> entry = object_list[index];
+                    KeyValuePair<string, JsonData> new_entry =
+                        new KeyValuePair<string, JsonData> (entry.Key, value);
+
+                    object_list[index] = new_entry;
+                    inst_object[entry.Key] = value;
+                }
+
+                json = null;
+            }
+        }
+        #endregion
+
+
+        #region Constructors
+        public JsonData ()
+        {
+        }
+
+        public JsonData (bool boolean)
+        {
+            type = JsonType.Boolean;
+            inst_boolean = boolean;
+        }
+
+        public JsonData (double number)
+        {
+            type = JsonType.Double;
+            inst_double = number;
+        }
+
+        public JsonData (int number)
+        {
+            type = JsonType.Int;
+            inst_int = number;
+        }
+
+        public JsonData (long number)
+        {
+            type = JsonType.Long;
+            inst_long = number;
+        }
+
+        public JsonData (object obj)
+        {
+            if (obj is Boolean) {
+                type = JsonType.Boolean;
+                inst_boolean = (bool) obj;
+                return;
+            }
+
+            if (obj is Double) {
+                type = JsonType.Double;
+                inst_double = (double) obj;
+                return;
+            }
+
+            if (obj is Int32) {
+                type = JsonType.Int;
+                inst_int = (int) obj;
+                return;
+            }
+
+            if (obj is Int64) {
+                type = JsonType.Long;
+                inst_long = (long) obj;
+                return;
+            }
+
+            if (obj is String) {
+                type = JsonType.String;
+                inst_string = (string) obj;
+                return;
+            }
+
+            throw new ArgumentException (
+                "Unable to wrap the given object with JsonData");
+        }
+
+        public JsonData (string str)
+        {
+            type = JsonType.String;
+            inst_string = str;
+        }
+        #endregion
+
+
+        #region Implicit Conversions
+        public static implicit operator JsonData (Boolean data)
+        {
+            return new JsonData (data);
+        }
+
+        public static implicit operator JsonData (Double data)
+        {
+            return new JsonData (data);
+        }
+
+        public static implicit operator JsonData (Int32 data)
+        {
+            return new JsonData (data);
+        }
+
+        public static implicit operator JsonData (Int64 data)
+        {
+            return new JsonData (data);
+        }
+
+        public static implicit operator JsonData (String data)
+        {
+            return new JsonData (data);
+        }
+        #endregion
+
+
+        #region Explicit Conversions
+        public static explicit operator Boolean (JsonData data)
+        {
+            if (data.type != JsonType.Boolean)
+                throw new InvalidCastException (
+                    "Instance of JsonData doesn't hold a double");
+
+            return data.inst_boolean;
+        }
+
+        public static explicit operator Double (JsonData data)
+        {
+            if (data.type != JsonType.Double)
+                throw new InvalidCastException (
+                    "Instance of JsonData doesn't hold a double");
+
+            return data.inst_double;
+        }
+
+        public static explicit operator Int32 (JsonData data)
+        {
+            if (data.type != JsonType.Int)
+                throw new InvalidCastException (
+                    "Instance of JsonData doesn't hold an int");
+
+            return data.inst_int;
+        }
+
+        public static explicit operator Int64 (JsonData data)
+        {
+            if (data.type != JsonType.Long && data.type != JsonType.Int)
+                throw new InvalidCastException (
+                    "Instance of JsonData doesn't hold an int");
+
+            return (data.type == JsonType.Long) ? data.inst_long : data.inst_int;
+        }
+
+        public static explicit operator String (JsonData data)
+        {
+            if (data.type != JsonType.String)
+                throw new InvalidCastException (
+                    "Instance of JsonData doesn't hold a string");
+
+            return data.inst_string;
+        }
+        #endregion
+
+
+        #region ICollection Methods
+        void ICollection.CopyTo (Array array, int index)
+        {
+            EnsureCollection ().CopyTo (array, index);
+        }
+        #endregion
+
+
+        #region IDictionary Methods
+        void IDictionary.Add (object key, object value)
+        {
+            JsonData data = ToJsonData (value);
+
+            EnsureDictionary ().Add (key, data);
+
+            KeyValuePair<string, JsonData> entry =
+                new KeyValuePair<string, JsonData> ((string) key, data);
+            object_list.Add (entry);
+
+            json = null;
+        }
+
+        void IDictionary.Clear ()
+        {
+            EnsureDictionary ().Clear ();
+            object_list.Clear ();
+            json = null;
+        }
+
+        bool IDictionary.Contains (object key)
+        {
+            return EnsureDictionary ().Contains (key);
+        }
+
+        IDictionaryEnumerator IDictionary.GetEnumerator ()
+        {
+            return ((IOrderedDictionary) this).GetEnumerator ();
+        }
+
+        void IDictionary.Remove (object key)
+        {
+            EnsureDictionary ().Remove (key);
+
+            for (int i = 0; i < object_list.Count; i++) {
+                if (object_list[i].Key == (string) key) {
+                    object_list.RemoveAt (i);
+                    break;
+                }
+            }
+
+            json = null;
+        }
+        #endregion
+
+
+        #region IEnumerable Methods
+        IEnumerator IEnumerable.GetEnumerator ()
+        {
+            return EnsureCollection ().GetEnumerator ();
+        }
+        #endregion
+
+
+        #region IJsonWrapper Methods
+        bool IJsonWrapper.GetBoolean ()
+        {
+            if (type != JsonType.Boolean)
+                throw new InvalidOperationException (
+                    "JsonData instance doesn't hold a boolean");
+
+            return inst_boolean;
+        }
+
+        double IJsonWrapper.GetDouble ()
+        {
+            if (type != JsonType.Double)
+                throw new InvalidOperationException (
+                    "JsonData instance doesn't hold a double");
+
+            return inst_double;
+        }
+
+        int IJsonWrapper.GetInt ()
+        {
+            if (type != JsonType.Int)
+                throw new InvalidOperationException (
+                    "JsonData instance doesn't hold an int");
+
+            return inst_int;
+        }
+
+        long IJsonWrapper.GetLong ()
+        {
+            if (type != JsonType.Long)
+                throw new InvalidOperationException (
+                    "JsonData instance doesn't hold a long");
+
+            return inst_long;
+        }
+
+        string IJsonWrapper.GetString ()
+        {
+            if (type != JsonType.String)
+                throw new InvalidOperationException (
+                    "JsonData instance doesn't hold a string");
+
+            return inst_string;
+        }
+
+        void IJsonWrapper.SetBoolean (bool val)
+        {
+            type = JsonType.Boolean;
+            inst_boolean = val;
+            json = null;
+        }
+
+        void IJsonWrapper.SetDouble (double val)
+        {
+            type = JsonType.Double;
+            inst_double = val;
+            json = null;
+        }
+
+        void IJsonWrapper.SetInt (int val)
+        {
+            type = JsonType.Int;
+            inst_int = val;
+            json = null;
+        }
+
+        void IJsonWrapper.SetLong (long val)
+        {
+            type = JsonType.Long;
+            inst_long = val;
+            json = null;
+        }
+
+        void IJsonWrapper.SetString (string val)
+        {
+            type = JsonType.String;
+            inst_string = val;
+            json = null;
+        }
+
+        string IJsonWrapper.ToJson ()
+        {
+            return ToJson ();
+        }
+
+        void IJsonWrapper.ToJson (JsonWriter writer)
+        {
+            ToJson (writer);
+        }
+        #endregion
+
+
+        #region IList Methods
+        int IList.Add (object value)
+        {
+            return Add (value);
+        }
+
+        void IList.Clear ()
+        {
+            EnsureList ().Clear ();
+            json = null;
+        }
+
+        bool IList.Contains (object value)
+        {
+            return EnsureList ().Contains (value);
+        }
+
+        int IList.IndexOf (object value)
+        {
+            return EnsureList ().IndexOf (value);
+        }
+
+        void IList.Insert (int index, object value)
+        {
+            EnsureList ().Insert (index, value);
+            json = null;
+        }
+
+        void IList.Remove (object value)
+        {
+            EnsureList ().Remove (value);
+            json = null;
+        }
+
+        void IList.RemoveAt (int index)
+        {
+            EnsureList ().RemoveAt (index);
+            json = null;
+        }
+        #endregion
+
+
+        #region IOrderedDictionary Methods
+        IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
+        {
+            EnsureDictionary ();
+
+            return new OrderedDictionaryEnumerator (
+                object_list.GetEnumerator ());
+        }
+
+        void IOrderedDictionary.Insert (int idx, object key, object value)
+        {
+            string property = (string) key;
+            JsonData data  = ToJsonData (value);
+
+            this[property] = data;
+
+            KeyValuePair<string, JsonData> entry =
+                new KeyValuePair<string, JsonData> (property, data);
+
+            object_list.Insert (idx, entry);
+        }
+
+        void IOrderedDictionary.RemoveAt (int idx)
+        {
+            EnsureDictionary ();
+
+            inst_object.Remove (object_list[idx].Key);
+            object_list.RemoveAt (idx);
+        }
+        #endregion
+
+
+        #region Private Methods
+        private ICollection EnsureCollection ()
+        {
+            if (type == JsonType.Array)
+                return (ICollection) inst_array;
+
+            if (type == JsonType.Object)
+                return (ICollection) inst_object;
+
+            throw new InvalidOperationException (
+                "The JsonData instance has to be initialized first");
+        }
+
+        private IDictionary EnsureDictionary ()
+        {
+            if (type == JsonType.Object)
+                return (IDictionary) inst_object;
+
+            if (type != JsonType.None)
+                throw new InvalidOperationException (
+                    "Instance of JsonData is not a dictionary");
+
+            type = JsonType.Object;
+            inst_object = new Dictionary<string, JsonData> ();
+            object_list = new List<KeyValuePair<string, JsonData>> ();
+
+            return (IDictionary) inst_object;
+        }
+
+        private IList EnsureList ()
+        {
+            if (type == JsonType.Array)
+                return (IList) inst_array;
+
+            if (type != JsonType.None)
+                throw new InvalidOperationException (
+                    "Instance of JsonData is not a list");
+
+            type = JsonType.Array;
+            inst_array = new List<JsonData> ();
+
+            return (IList) inst_array;
+        }
+
+        private JsonData ToJsonData (object obj)
+        {
+            if (obj == null)
+                return null;
+
+            if (obj is JsonData)
+                return (JsonData) obj;
+
+            return new JsonData (obj);
+        }
+
+        private static void WriteJson (IJsonWrapper obj, JsonWriter writer)
+        {
+            if (obj == null) {
+                writer.Write (null);
+                return;
+            }
+
+            if (obj.IsString) {
+                writer.Write (obj.GetString ());
+                return;
+            }
+
+            if (obj.IsBoolean) {
+                writer.Write (obj.GetBoolean ());
+                return;
+            }
+
+            if (obj.IsDouble) {
+                writer.Write (obj.GetDouble ());
+                return;
+            }
+
+            if (obj.IsInt) {
+                writer.Write (obj.GetInt ());
+                return;
+            }
+
+            if (obj.IsLong) {
+                writer.Write (obj.GetLong ());
+                return;
+            }
+
+            if (obj.IsArray) {
+                writer.WriteArrayStart ();
+                foreach (object elem in (IList) obj)
+                    WriteJson ((JsonData) elem, writer);
+                writer.WriteArrayEnd ();
+
+                return;
+            }
+
+            if (obj.IsObject) {
+                writer.WriteObjectStart ();
+
+                foreach (DictionaryEntry entry in ((IDictionary) obj)) {
+                    writer.WritePropertyName ((string) entry.Key);
+                    WriteJson ((JsonData) entry.Value, writer);
+                }
+                writer.WriteObjectEnd ();
+
+                return;
+            }
+        }
+        #endregion
+
+
+        public int Add (object value)
+        {
+            JsonData data = ToJsonData (value);
+
+            json = null;
+
+            return EnsureList ().Add (data);
+        }
+
+        public void Clear ()
+        {
+            if (IsObject) {
+                ((IDictionary) this).Clear ();
+                return;
+            }
+
+            if (IsArray) {
+                ((IList) this).Clear ();
+                return;
+            }
+        }
+
+        public bool Equals (JsonData x)
+        {
+            if (x == null)
+                return false;
+
+            if (x.type != this.type)
+                return false;
+
+            switch (this.type) {
+            case JsonType.None:
+                return true;
+
+            case JsonType.Object:
+                return this.inst_object.Equals (x.inst_object);
+
+            case JsonType.Array:
+                return this.inst_array.Equals (x.inst_array);
+
+            case JsonType.String:
+                return this.inst_string.Equals (x.inst_string);
+
+            case JsonType.Int:
+                return this.inst_int.Equals (x.inst_int);
+
+            case JsonType.Long:
+                return this.inst_long.Equals (x.inst_long);
+
+            case JsonType.Double:
+                return this.inst_double.Equals (x.inst_double);
+
+            case JsonType.Boolean:
+                return this.inst_boolean.Equals (x.inst_boolean);
+            }
+
+            return false;
+        }
+
+        public JsonType GetJsonType ()
+        {
+            return type;
+        }
+
+        public void SetJsonType (JsonType type)
+        {
+            if (this.type == type)
+                return;
+
+            switch (type) {
+            case JsonType.None:
+                break;
+
+            case JsonType.Object:
+                inst_object = new Dictionary<string, JsonData> ();
+                object_list = new List<KeyValuePair<string, JsonData>> ();
+                break;
+
+            case JsonType.Array:
+                inst_array = new List<JsonData> ();
+                break;
+
+            case JsonType.String:
+                inst_string = default (String);
+                break;
+
+            case JsonType.Int:
+                inst_int = default (Int32);
+                break;
+
+            case JsonType.Long:
+                inst_long = default (Int64);
+                break;
+
+            case JsonType.Double:
+                inst_double = default (Double);
+                break;
+
+            case JsonType.Boolean:
+                inst_boolean = default (Boolean);
+                break;
+            }
+
+            this.type = type;
+        }
+
+        public string ToJson ()
+        {
+            if (json != null)
+                return json;
+
+            StringWriter sw = new StringWriter ();
+            JsonWriter writer = new JsonWriter (sw);
+            writer.Validate = false;
+
+            WriteJson (this, writer);
+            json = sw.ToString ();
+
+            return json;
+        }
+
+        public void ToJson (JsonWriter writer)
+        {
+            bool old_validate = writer.Validate;
+
+            writer.Validate = false;
+
+            WriteJson (this, writer);
+
+            writer.Validate = old_validate;
+        }
+
+        public override string ToString ()
+        {
+            switch (type) {
+            case JsonType.Array:
+                return "JsonData array";
+
+            case JsonType.Boolean:
+                return inst_boolean.ToString ();
+
+            case JsonType.Double:
+                return inst_double.ToString ();
+
+            case JsonType.Int:
+                return inst_int.ToString ();
+
+            case JsonType.Long:
+                return inst_long.ToString ();
+
+            case JsonType.Object:
+                return "JsonData object";
+
+            case JsonType.String:
+                return inst_string;
+            }
+
+            return "Uninitialized JsonData";
+        }
+    }
+
+
+    internal class OrderedDictionaryEnumerator : IDictionaryEnumerator
+    {
+        IEnumerator<KeyValuePair<string, JsonData>> list_enumerator;
+
+
+        public object Current {
+            get { return Entry; }
+        }
+
+        public DictionaryEntry Entry {
+            get {
+                KeyValuePair<string, JsonData> curr = list_enumerator.Current;
+                return new DictionaryEntry (curr.Key, curr.Value);
+            }
+        }
+
+        public object Key {
+            get { return list_enumerator.Current.Key; }
+        }
+        
+
+        public object Value {
+            get { return list_enumerator.Current.Value; }
+        }
+
+
+        public OrderedDictionaryEnumerator (
+            IEnumerator<KeyValuePair<string, JsonData>> enumerator)
+        {
+            list_enumerator = enumerator;
+        }
+
+
+        public bool MoveNext ()
+        {
+            return list_enumerator.MoveNext ();
+        }
+
+        public void Reset ()
+        {
+            list_enumerator.Reset ();
+        }
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonException.cs b/Librarys/litjson/litjson/JsonException.cs
new file mode 100644
index 0000000..4efd890
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonException.cs
@@ -0,0 +1,65 @@
+#region Header
+/**
+ * JsonException.cs
+ *   Base class throwed by LitJSON when a parsing error occurs.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+
+
+namespace LitJson
+{
+    public class JsonException :
+#if NETSTANDARD1_5
+        Exception
+#else
+        ApplicationException
+#endif
+    {
+        public JsonException () : base ()
+        {
+        }
+
+        internal JsonException (ParserToken token) :
+            base (String.Format (
+                    "Invalid token '{0}' in input string", token))
+        {
+        }
+
+        internal JsonException (ParserToken token,
+                                Exception inner_exception) :
+            base (String.Format (
+                    "Invalid token '{0}' in input string", token),
+                inner_exception)
+        {
+        }
+
+        internal JsonException (int c) :
+            base (String.Format (
+                    "Invalid character '{0}' in input string", (char) c))
+        {
+        }
+
+        internal JsonException (int c, Exception inner_exception) :
+            base (String.Format (
+                    "Invalid character '{0}' in input string", (char) c),
+                inner_exception)
+        {
+        }
+
+
+        public JsonException (string message) : base (message)
+        {
+        }
+
+        public JsonException (string message, Exception inner_exception) :
+            base (message, inner_exception)
+        {
+        }
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonMapper.cs b/Librarys/litjson/litjson/JsonMapper.cs
new file mode 100644
index 0000000..bf70994
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonMapper.cs
@@ -0,0 +1,944 @@
+#region Header
+/**
+ * JsonMapper.cs
+ *   JSON to .Net object and object to JSON conversions.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+
+
+namespace LitJson
+{
+    internal struct PropertyMetadata
+    {
+        public MemberInfo Info;
+        public bool       IsField;
+        public Type       Type;
+    }
+
+
+    internal struct ArrayMetadata
+    {
+        private Type element_type;
+        private bool is_array;
+        private bool is_list;
+
+
+        public Type ElementType {
+            get {
+                if (element_type == null)
+                    return typeof (JsonData);
+
+                return element_type;
+            }
+
+            set { element_type = value; }
+        }
+
+        public bool IsArray {
+            get { return is_array; }
+            set { is_array = value; }
+        }
+
+        public bool IsList {
+            get { return is_list; }
+            set { is_list = value; }
+        }
+    }
+
+
+    internal struct ObjectMetadata
+    {
+        private Type element_type;
+        private bool is_dictionary;
+
+        private IDictionary<string, PropertyMetadata> properties;
+
+
+        public Type ElementType {
+            get {
+                if (element_type == null)
+                    return typeof (JsonData);
+
+                return element_type;
+            }
+
+            set { element_type = value; }
+        }
+
+        public bool IsDictionary {
+            get { return is_dictionary; }
+            set { is_dictionary = value; }
+        }
+
+        public IDictionary<string, PropertyMetadata> Properties {
+            get { return properties; }
+            set { properties = value; }
+        }
+    }
+
+
+    internal delegate void ExporterFunc    (object obj, JsonWriter writer);
+    public   delegate void ExporterFunc<T> (T obj, JsonWriter writer);
+
+    internal delegate object ImporterFunc                (object input);
+    public   delegate TValue ImporterFunc<TJson, TValue> (TJson input);
+
+    public delegate IJsonWrapper WrapperFactory ();
+
+
+    public class JsonMapper
+    {
+        #region Fields
+        private static readonly int max_nesting_depth;
+
+        private static readonly IFormatProvider datetime_format;
+
+        private static readonly IDictionary<Type, ExporterFunc> base_exporters_table;
+        private static readonly IDictionary<Type, ExporterFunc> custom_exporters_table;
+
+        private static readonly IDictionary<Type,
+                IDictionary<Type, ImporterFunc>> base_importers_table;
+        private static readonly IDictionary<Type,
+                IDictionary<Type, ImporterFunc>> custom_importers_table;
+
+        private static readonly IDictionary<Type, ArrayMetadata> array_metadata;
+        private static readonly object array_metadata_lock = new Object ();
+
+        private static readonly IDictionary<Type,
+                IDictionary<Type, MethodInfo>> conv_ops;
+        private static readonly object conv_ops_lock = new Object ();
+
+        private static readonly IDictionary<Type, ObjectMetadata> object_metadata;
+        private static readonly object object_metadata_lock = new Object ();
+
+        private static readonly IDictionary<Type,
+                IList<PropertyMetadata>> type_properties;
+        private static readonly object type_properties_lock = new Object ();
+
+        private static readonly JsonWriter      static_writer;
+        private static readonly object static_writer_lock = new Object ();
+        #endregion
+
+
+        #region Constructors
+        static JsonMapper ()
+        {
+            max_nesting_depth = 100;
+
+            array_metadata = new Dictionary<Type, ArrayMetadata> ();
+            conv_ops = new Dictionary<Type, IDictionary<Type, MethodInfo>> ();
+            object_metadata = new Dictionary<Type, ObjectMetadata> ();
+            type_properties = new Dictionary<Type,
+                            IList<PropertyMetadata>> ();
+
+            static_writer = new JsonWriter ();
+
+            datetime_format = DateTimeFormatInfo.InvariantInfo;
+
+            base_exporters_table   = new Dictionary<Type, ExporterFunc> ();
+            custom_exporters_table = new Dictionary<Type, ExporterFunc> ();
+
+            base_importers_table = new Dictionary<Type,
+                                 IDictionary<Type, ImporterFunc>> ();
+            custom_importers_table = new Dictionary<Type,
+                                   IDictionary<Type, ImporterFunc>> ();
+
+            RegisterBaseExporters ();
+            RegisterBaseImporters ();
+        }
+        #endregion
+
+
+        #region Private Methods
+        private static void AddArrayMetadata (Type type)
+        {
+            if (array_metadata.ContainsKey (type))
+                return;
+
+            ArrayMetadata data = new ArrayMetadata ();
+
+            data.IsArray = type.IsArray;
+
+            if (type.GetInterface ("System.Collections.IList") != null)
+                data.IsList = true;
+
+            foreach (PropertyInfo p_info in type.GetProperties ()) {
+                if (p_info.Name != "Item")
+                    continue;
+
+                ParameterInfo[] parameters = p_info.GetIndexParameters ();
+
+                if (parameters.Length != 1)
+                    continue;
+
+                if (parameters[0].ParameterType == typeof (int))
+                    data.ElementType = p_info.PropertyType;
+            }
+
+            lock (array_metadata_lock) {
+                try {
+                    array_metadata.Add (type, data);
+                } catch (ArgumentException) {
+                    return;
+                }
+            }
+        }
+
+        private static void AddObjectMetadata (Type type)
+        {
+            if (object_metadata.ContainsKey (type))
+                return;
+
+            ObjectMetadata data = new ObjectMetadata ();
+
+            if (type.GetInterface ("System.Collections.IDictionary") != null)
+                data.IsDictionary = true;
+
+            data.Properties = new Dictionary<string, PropertyMetadata> ();
+
+            foreach (PropertyInfo p_info in type.GetProperties ()) {
+                if (p_info.Name == "Item") {
+                    ParameterInfo[] parameters = p_info.GetIndexParameters ();
+
+                    if (parameters.Length != 1)
+                        continue;
+
+                    if (parameters[0].ParameterType == typeof (string))
+                        data.ElementType = p_info.PropertyType;
+
+                    continue;
+                }
+
+                PropertyMetadata p_data = new PropertyMetadata ();
+                p_data.Info = p_info;
+                p_data.Type = p_info.PropertyType;
+
+                data.Properties.Add (p_info.Name, p_data);
+            }
+
+            foreach (FieldInfo f_info in type.GetFields ()) {
+                PropertyMetadata p_data = new PropertyMetadata ();
+                p_data.Info = f_info;
+                p_data.IsField = true;
+                p_data.Type = f_info.FieldType;
+
+                data.Properties.Add (f_info.Name, p_data);
+            }
+
+            lock (object_metadata_lock) {
+                try {
+                    object_metadata.Add (type, data);
+                } catch (ArgumentException) {
+                    return;
+                }
+            }
+        }
+
+        private static void AddTypeProperties (Type type)
+        {
+            if (type_properties.ContainsKey (type))
+                return;
+
+            IList<PropertyMetadata> props = new List<PropertyMetadata> ();
+
+            foreach (PropertyInfo p_info in type.GetProperties ()) {
+                if (p_info.Name == "Item")
+                    continue;
+
+                PropertyMetadata p_data = new PropertyMetadata ();
+                p_data.Info = p_info;
+                p_data.IsField = false;
+                props.Add (p_data);
+            }
+
+            foreach (FieldInfo f_info in type.GetFields ()) {
+                PropertyMetadata p_data = new PropertyMetadata ();
+                p_data.Info = f_info;
+                p_data.IsField = true;
+
+                props.Add (p_data);
+            }
+
+            lock (type_properties_lock) {
+                try {
+                    type_properties.Add (type, props);
+                } catch (ArgumentException) {
+                    return;
+                }
+            }
+        }
+
+        private static MethodInfo GetConvOp (Type t1, Type t2)
+        {
+            lock (conv_ops_lock) {
+                if (! conv_ops.ContainsKey (t1))
+                    conv_ops.Add (t1, new Dictionary<Type, MethodInfo> ());
+            }
+
+            if (conv_ops[t1].ContainsKey (t2))
+                return conv_ops[t1][t2];
+
+            MethodInfo op = t1.GetMethod (
+                "op_Implicit", new Type[] { t2 });
+
+            lock (conv_ops_lock) {
+                try {
+                    conv_ops[t1].Add (t2, op);
+                } catch (ArgumentException) {
+                    return conv_ops[t1][t2];
+                }
+            }
+
+            return op;
+        }
+
+        private static object ReadValue (Type inst_type, JsonReader reader)
+        {
+            reader.Read ();
+
+            if (reader.Token == JsonToken.ArrayEnd)
+                return null;
+
+            Type underlying_type = Nullable.GetUnderlyingType(inst_type);
+            Type value_type = underlying_type ?? inst_type;
+
+            if (reader.Token == JsonToken.Null) {
+                #if NETSTANDARD1_5
+                if (inst_type.IsClass() || underlying_type != null) {
+                    return null;
+                }
+                #else
+                if (inst_type.IsClass || underlying_type != null) {
+                    return null;
+                }
+                #endif
+
+                throw new JsonException (String.Format (
+                            "Can't assign null to an instance of type {0}",
+                            inst_type));
+            }
+
+            if (reader.Token == JsonToken.Double ||
+                reader.Token == JsonToken.Int ||
+                reader.Token == JsonToken.Long ||
+                reader.Token == JsonToken.String ||
+                reader.Token == JsonToken.Boolean) {
+
+                Type json_type = reader.Value.GetType ();
+
+                if (value_type.IsAssignableFrom (json_type))
+                    return reader.Value;
+
+                // If there's a custom importer that fits, use it
+                if (custom_importers_table.ContainsKey (json_type) &&
+                    custom_importers_table[json_type].ContainsKey (
+                        value_type)) {
+
+                    ImporterFunc importer =
+                        custom_importers_table[json_type][value_type];
+
+                    return importer (reader.Value);
+                }
+
+                // Maybe there's a base importer that works
+                if (base_importers_table.ContainsKey (json_type) &&
+                    base_importers_table[json_type].ContainsKey (
+                        value_type)) {
+
+                    ImporterFunc importer =
+                        base_importers_table[json_type][value_type];
+
+                    return importer (reader.Value);
+                }
+
+                // Maybe it's an enum
+                #if NETSTANDARD1_5
+                if (value_type.IsEnum())
+                    return Enum.ToObject (value_type, reader.Value);
+                #else
+                if (value_type.IsEnum)
+                    return Enum.ToObject (value_type, reader.Value);
+                #endif
+                // Try using an implicit conversion operator
+                MethodInfo conv_op = GetConvOp (value_type, json_type);
+
+                if (conv_op != null)
+                    return conv_op.Invoke (null,
+                                           new object[] { reader.Value });
+
+                // No luck
+                throw new JsonException (String.Format (
+                        "Can't assign value '{0}' (type {1}) to type {2}",
+                        reader.Value, json_type, inst_type));
+            }
+
+            object instance = null;
+
+            if (reader.Token == JsonToken.ArrayStart) {
+
+                AddArrayMetadata (inst_type);
+                ArrayMetadata t_data = array_metadata[inst_type];
+
+                if (! t_data.IsArray && ! t_data.IsList)
+                    throw new JsonException (String.Format (
+                            "Type {0} can't act as an array",
+                            inst_type));
+
+                IList list;
+                Type elem_type;
+
+                if (! t_data.IsArray) {
+                    list = (IList) Activator.CreateInstance (inst_type);
+                    elem_type = t_data.ElementType;
+                } else {
+                    list = new ArrayList ();
+                    elem_type = inst_type.GetElementType ();
+                }
+
+                while (true) {
+                    object item = ReadValue (elem_type, reader);
+                    if (item == null && reader.Token == JsonToken.ArrayEnd)
+                        break;
+
+                    list.Add (item);
+                }
+
+                if (t_data.IsArray) {
+                    int n = list.Count;
+                    instance = Array.CreateInstance (elem_type, n);
+
+                    for (int i = 0; i < n; i++)
+                        ((Array) instance).SetValue (list[i], i);
+                } else
+                    instance = list;
+
+            } else if (reader.Token == JsonToken.ObjectStart) {
+                AddObjectMetadata (value_type);
+                ObjectMetadata t_data = object_metadata[value_type];
+
+                instance = Activator.CreateInstance (value_type);
+
+                while (true) {
+                    reader.Read ();
+
+                    if (reader.Token == JsonToken.ObjectEnd)
+                        break;
+
+                    string property = (string) reader.Value;
+
+                    if (t_data.Properties.ContainsKey (property)) {
+                        PropertyMetadata prop_data =
+                            t_data.Properties[property];
+
+                        if (prop_data.IsField) {
+                            ((FieldInfo) prop_data.Info).SetValue (
+                                instance, ReadValue (prop_data.Type, reader));
+                        } else {
+                            PropertyInfo p_info =
+                                (PropertyInfo) prop_data.Info;
+
+                            if (p_info.CanWrite)
+                                p_info.SetValue (
+                                    instance,
+                                    ReadValue (prop_data.Type, reader),
+                                    null);
+                            else
+                                ReadValue (prop_data.Type, reader);
+                        }
+
+                    } else {
+                        if (! t_data.IsDictionary) {
+
+                            if (! reader.SkipNonMembers) {
+                                throw new JsonException (String.Format (
+                                        "The type {0} doesn't have the " +
+                                        "property '{1}'",
+                                        inst_type, property));
+                            } else {
+                                ReadSkip (reader);
+                                continue;
+                            }
+                        }
+
+                        ((IDictionary) instance).Add (
+                            property, ReadValue (
+                                t_data.ElementType, reader));
+                    }
+
+                }
+
+            }
+
+            return instance;
+        }
+
+        private static IJsonWrapper ReadValue (WrapperFactory factory,
+                                               JsonReader reader)
+        {
+            reader.Read ();
+
+            if (reader.Token == JsonToken.ArrayEnd ||
+                reader.Token == JsonToken.Null)
+                return null;
+
+            IJsonWrapper instance = factory ();
+
+            if (reader.Token == JsonToken.String) {
+                instance.SetString ((string) reader.Value);
+                return instance;
+            }
+
+            if (reader.Token == JsonToken.Double) {
+                instance.SetDouble ((double) reader.Value);
+                return instance;
+            }
+
+            if (reader.Token == JsonToken.Int) {
+                instance.SetInt ((int) reader.Value);
+                return instance;
+            }
+
+            if (reader.Token == JsonToken.Long) {
+                instance.SetLong ((long) reader.Value);
+                return instance;
+            }
+
+            if (reader.Token == JsonToken.Boolean) {
+                instance.SetBoolean ((bool) reader.Value);
+                return instance;
+            }
+
+            if (reader.Token == JsonToken.ArrayStart) {
+                instance.SetJsonType (JsonType.Array);
+
+                while (true) {
+                    IJsonWrapper item = ReadValue (factory, reader);
+                    if (item == null && reader.Token == JsonToken.ArrayEnd)
+                        break;
+
+                    ((IList) instance).Add (item);
+                }
+            }
+            else if (reader.Token == JsonToken.ObjectStart) {
+                instance.SetJsonType (JsonType.Object);
+
+                while (true) {
+                    reader.Read ();
+
+                    if (reader.Token == JsonToken.ObjectEnd)
+                        break;
+
+                    string property = (string) reader.Value;
+
+                    ((IDictionary) instance)[property] = ReadValue (
+                        factory, reader);
+                }
+
+            }
+
+            return instance;
+        }
+
+        private static void ReadSkip (JsonReader reader)
+        {
+            ToWrapper (
+                delegate { return new JsonMockWrapper (); }, reader);
+        }
+
+        private static void RegisterBaseExporters ()
+        {
+            base_exporters_table[typeof (byte)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToInt32 ((byte) obj));
+                };
+
+            base_exporters_table[typeof (char)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToString ((char) obj));
+                };
+
+            base_exporters_table[typeof (DateTime)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToString ((DateTime) obj,
+                                                    datetime_format));
+                };
+
+            base_exporters_table[typeof (decimal)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write ((decimal) obj);
+                };
+
+            base_exporters_table[typeof (sbyte)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToInt32 ((sbyte) obj));
+                };
+
+            base_exporters_table[typeof (short)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToInt32 ((short) obj));
+                };
+
+            base_exporters_table[typeof (ushort)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToInt32 ((ushort) obj));
+                };
+
+            base_exporters_table[typeof (uint)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write (Convert.ToUInt64 ((uint) obj));
+                };
+
+            base_exporters_table[typeof (ulong)] =
+                delegate (object obj, JsonWriter writer) {
+                    writer.Write ((ulong) obj);
+                };
+        }
+
+        private static void RegisterBaseImporters ()
+        {
+            ImporterFunc importer;
+
+            importer = delegate (object input) {
+                return Convert.ToByte ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (byte), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToUInt64 ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (ulong), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToSByte ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (sbyte), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToInt16 ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (short), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToUInt16 ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (ushort), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToUInt32 ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (uint), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToSingle ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (float), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToDouble ((int) input);
+            };
+            RegisterImporter (base_importers_table, typeof (int),
+                              typeof (double), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToDecimal ((double) input);
+            };
+            RegisterImporter (base_importers_table, typeof (double),
+                              typeof (decimal), importer);
+
+
+            importer = delegate (object input) {
+                return Convert.ToUInt32 ((long) input);
+            };
+            RegisterImporter (base_importers_table, typeof (long),
+                              typeof (uint), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToChar ((string) input);
+            };
+            RegisterImporter (base_importers_table, typeof (string),
+                              typeof (char), importer);
+
+            importer = delegate (object input) {
+                return Convert.ToDateTime ((string) input, datetime_format);
+            };
+            RegisterImporter (base_importers_table, typeof (string),
+                              typeof (DateTime), importer);
+        }
+
+        private static void RegisterImporter (
+            IDictionary<Type, IDictionary<Type, ImporterFunc>> table,
+            Type json_type, Type value_type, ImporterFunc importer)
+        {
+            if (! table.ContainsKey (json_type))
+                table.Add (json_type, new Dictionary<Type, ImporterFunc> ());
+
+            table[json_type][value_type] = importer;
+        }
+
+        private static void WriteValue (object obj, JsonWriter writer,
+                                        bool writer_is_private,
+                                        int depth)
+        {
+            if (depth > max_nesting_depth)
+                throw new JsonException (
+                    String.Format ("Max allowed object depth reached while " +
+                                   "trying to export from type {0}",
+                                   obj.GetType ()));
+
+            if (obj == null) {
+                writer.Write (null);
+                return;
+            }
+
+            if (obj is IJsonWrapper) {
+                if (writer_is_private)
+                    writer.TextWriter.Write (((IJsonWrapper) obj).ToJson ());
+                else
+                    ((IJsonWrapper) obj).ToJson (writer);
+
+                return;
+            }
+
+            if (obj is String) {
+                writer.Write ((string) obj);
+                return;
+            }
+
+            if (obj is Double) {
+                writer.Write ((double) obj);
+                return;
+            }
+
+            if (obj is Int32) {
+                writer.Write ((int) obj);
+                return;
+            }
+
+            if (obj is Boolean) {
+                writer.Write ((bool) obj);
+                return;
+            }
+
+            if (obj is Int64) {
+                writer.Write ((long) obj);
+                return;
+            }
+
+            if (obj is Array) {
+                writer.WriteArrayStart ();
+
+                foreach (object elem in (Array) obj)
+                    WriteValue (elem, writer, writer_is_private, depth + 1);
+
+                writer.WriteArrayEnd ();
+
+                return;
+            }
+
+            if (obj is IList) {
+                writer.WriteArrayStart ();
+                foreach (object elem in (IList) obj)
+                    WriteValue (elem, writer, writer_is_private, depth + 1);
+                writer.WriteArrayEnd ();
+
+                return;
+            }
+
+            if (obj is IDictionary) {
+                writer.WriteObjectStart ();
+                foreach (DictionaryEntry entry in (IDictionary) obj) {
+                    writer.WritePropertyName ((string) entry.Key);
+                    WriteValue (entry.Value, writer, writer_is_private,
+                                depth + 1);
+                }
+                writer.WriteObjectEnd ();
+
+                return;
+            }
+
+            Type obj_type = obj.GetType ();
+
+            // See if there's a custom exporter for the object
+            if (custom_exporters_table.ContainsKey (obj_type)) {
+                ExporterFunc exporter = custom_exporters_table[obj_type];
+                exporter (obj, writer);
+
+                return;
+            }
+
+            // If not, maybe there's a base exporter
+            if (base_exporters_table.ContainsKey (obj_type)) {
+                ExporterFunc exporter = base_exporters_table[obj_type];
+                exporter (obj, writer);
+
+                return;
+            }
+
+            // Last option, let's see if it's an enum
+            if (obj is Enum) {
+                Type e_type = Enum.GetUnderlyingType (obj_type);
+
+                if (e_type == typeof (long)
+                    || e_type == typeof (uint)
+                    || e_type == typeof (ulong))
+                    writer.Write ((ulong) obj);
+                else
+                    writer.Write ((int) obj);
+
+                return;
+            }
+
+            // Okay, so it looks like the input should be exported as an
+            // object
+            AddTypeProperties (obj_type);
+            IList<PropertyMetadata> props = type_properties[obj_type];
+
+            writer.WriteObjectStart ();
+            foreach (PropertyMetadata p_data in props) {
+                if (p_data.IsField) {
+                    writer.WritePropertyName (p_data.Info.Name);
+                    WriteValue (((FieldInfo) p_data.Info).GetValue (obj),
+                                writer, writer_is_private, depth + 1);
+                }
+                else {
+                    PropertyInfo p_info = (PropertyInfo) p_data.Info;
+
+                    if (p_info.CanRead) {
+                        writer.WritePropertyName (p_data.Info.Name);
+                        WriteValue (p_info.GetValue (obj, null),
+                                    writer, writer_is_private, depth + 1);
+                    }
+                }
+            }
+            writer.WriteObjectEnd ();
+        }
+        #endregion
+
+
+        public static string ToJson (object obj)
+        {
+            lock (static_writer_lock) {
+                static_writer.Reset ();
+
+                WriteValue (obj, static_writer, true, 0);
+
+                return static_writer.ToString ();
+            }
+        }
+
+        public static void ToJson (object obj, JsonWriter writer)
+        {
+            WriteValue (obj, writer, false, 0);
+        }
+
+        public static JsonData ToObject (JsonReader reader)
+        {
+            return (JsonData) ToWrapper (
+                delegate { return new JsonData (); }, reader);
+        }
+
+        public static JsonData ToObject (TextReader reader)
+        {
+            JsonReader json_reader = new JsonReader (reader);
+
+            return (JsonData) ToWrapper (
+                delegate { return new JsonData (); }, json_reader);
+        }
+
+        public static JsonData ToObject (string json)
+        {
+            return (JsonData) ToWrapper (
+                delegate { return new JsonData (); }, json);
+        }
+
+        public static T ToObject<T> (JsonReader reader)
+        {
+            return (T) ReadValue (typeof (T), reader);
+        }
+
+        public static T ToObject<T> (TextReader reader)
+        {
+            JsonReader json_reader = new JsonReader (reader);
+
+            return (T) ReadValue (typeof (T), json_reader);
+        }
+
+        public static T ToObject<T> (string json)
+        {
+            JsonReader reader = new JsonReader (json);
+
+            return (T) ReadValue (typeof (T), reader);
+        }
+        
+        public static object ToObject(string json, Type ConvertType )
+        {
+            JsonReader reader = new JsonReader(json);
+
+            return ReadValue(ConvertType, reader);
+        }
+
+        public static IJsonWrapper ToWrapper (WrapperFactory factory,
+                                              JsonReader reader)
+        {
+            return ReadValue (factory, reader);
+        }
+
+        public static IJsonWrapper ToWrapper (WrapperFactory factory,
+                                              string json)
+        {
+            JsonReader reader = new JsonReader (json);
+
+            return ReadValue (factory, reader);
+        }
+
+        public static void RegisterExporter<T> (ExporterFunc<T> exporter)
+        {
+            ExporterFunc exporter_wrapper =
+                delegate (object obj, JsonWriter writer) {
+                    exporter ((T) obj, writer);
+                };
+
+            custom_exporters_table[typeof (T)] = exporter_wrapper;
+        }
+
+        public static void RegisterImporter<TJson, TValue> (
+            ImporterFunc<TJson, TValue> importer)
+        {
+            ImporterFunc importer_wrapper =
+                delegate (object input) {
+                    return importer ((TJson) input);
+                };
+
+            RegisterImporter (custom_importers_table, typeof (TJson),
+                              typeof (TValue), importer_wrapper);
+        }
+
+        public static void UnregisterExporters ()
+        {
+            custom_exporters_table.Clear ();
+        }
+
+        public static void UnregisterImporters ()
+        {
+            custom_importers_table.Clear ();
+        }
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonMockWrapper.cs b/Librarys/litjson/litjson/JsonMockWrapper.cs
new file mode 100644
index 0000000..dfe7adb
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonMockWrapper.cs
@@ -0,0 +1,105 @@
+#region Header
+/**
+ * JsonMockWrapper.cs
+ *   Mock object implementing IJsonWrapper, to facilitate actions like
+ *   skipping data more efficiently.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+
+namespace LitJson
+{
+    public class JsonMockWrapper : IJsonWrapper
+    {
+        public bool IsArray   { get { return false; } }
+        public bool IsBoolean { get { return false; } }
+        public bool IsDouble  { get { return false; } }
+        public bool IsInt     { get { return false; } }
+        public bool IsLong    { get { return false; } }
+        public bool IsObject  { get { return false; } }
+        public bool IsString  { get { return false; } }
+
+        public bool     GetBoolean ()  { return false; }
+        public double   GetDouble ()   { return 0.0; }
+        public int      GetInt ()      { return 0; }
+        public JsonType GetJsonType () { return JsonType.None; }
+        public long     GetLong ()     { return 0L; }
+        public string   GetString ()   { return ""; }
+
+        public void SetBoolean  (bool val)      {}
+        public void SetDouble   (double val)    {}
+        public void SetInt      (int val)       {}
+        public void SetJsonType (JsonType type) {}
+        public void SetLong     (long val)      {}
+        public void SetString   (string val)    {}
+
+        public string ToJson ()                  { return ""; }
+        public void   ToJson (JsonWriter writer) {}
+
+
+        bool IList.IsFixedSize { get { return true; } }
+        bool IList.IsReadOnly  { get { return true; } }
+
+        object IList.this[int index] {
+            get { return null; }
+            set {}
+        }
+
+        int  IList.Add (object value)       { return 0; }
+        void IList.Clear ()                 {}
+        bool IList.Contains (object value)  { return false; }
+        int  IList.IndexOf (object value)   { return -1; }
+        void IList.Insert (int i, object v) {}
+        void IList.Remove (object value)    {}
+        void IList.RemoveAt (int index)     {}
+
+
+        int    ICollection.Count          { get { return 0; } }
+        bool   ICollection.IsSynchronized { get { return false; } }
+        object ICollection.SyncRoot       { get { return null; } }
+
+        void ICollection.CopyTo (Array array, int index) {}
+
+
+        IEnumerator IEnumerable.GetEnumerator () { return null; }
+
+
+        bool IDictionary.IsFixedSize { get { return true; } }
+        bool IDictionary.IsReadOnly  { get { return true; } }
+
+        ICollection IDictionary.Keys   { get { return null; } }
+        ICollection IDictionary.Values { get { return null; } }
+
+        object IDictionary.this[object key] {
+            get { return null; }
+            set {}
+        }
+
+        void IDictionary.Add (object k, object v) {}
+        void IDictionary.Clear ()                 {}
+        bool IDictionary.Contains (object key)    { return false; }
+        void IDictionary.Remove (object key)      {}
+
+        IDictionaryEnumerator IDictionary.GetEnumerator () { return null; }
+
+
+        object IOrderedDictionary.this[int idx] {
+            get { return null; }
+            set {}
+        }
+
+        IDictionaryEnumerator IOrderedDictionary.GetEnumerator () {
+            return null;
+        }
+        void IOrderedDictionary.Insert   (int i, object k, object v) {}
+        void IOrderedDictionary.RemoveAt (int i) {}
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonReader.cs b/Librarys/litjson/litjson/JsonReader.cs
new file mode 100644
index 0000000..e47eabc
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonReader.cs
@@ -0,0 +1,478 @@
+#region Header
+/**
+ * JsonReader.cs
+ *   Stream-like access to JSON text.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+    public enum JsonToken
+    {
+        None,
+
+        ObjectStart,
+        PropertyName,
+        ObjectEnd,
+
+        ArrayStart,
+        ArrayEnd,
+
+        Int,
+        Long,
+        Double,
+
+        String,
+
+        Boolean,
+        Null
+    }
+
+
+    public class JsonReader
+    {
+        #region Fields
+        private static readonly IDictionary<int, IDictionary<int, int[]>> parse_table;
+
+        private Stack<int>    automaton_stack;
+        private int           current_input;
+        private int           current_symbol;
+        private bool          end_of_json;
+        private bool          end_of_input;
+        private Lexer         lexer;
+        private bool          parser_in_string;
+        private bool          parser_return;
+        private bool          read_started;
+        private TextReader    reader;
+        private bool          reader_is_owned;
+        private bool          skip_non_members;
+        private object        token_value;
+        private JsonToken     token;
+        #endregion
+
+
+        #region Public Properties
+        public bool AllowComments {
+            get { return lexer.AllowComments; }
+            set { lexer.AllowComments = value; }
+        }
+
+        public bool AllowSingleQuotedStrings {
+            get { return lexer.AllowSingleQuotedStrings; }
+            set { lexer.AllowSingleQuotedStrings = value; }
+        }
+
+        public bool SkipNonMembers {
+            get { return skip_non_members; }
+            set { skip_non_members = value; }
+        }
+
+        public bool EndOfInput {
+            get { return end_of_input; }
+        }
+
+        public bool EndOfJson {
+            get { return end_of_json; }
+        }
+
+        public JsonToken Token {
+            get { return token; }
+        }
+
+        public object Value {
+            get { return token_value; }
+        }
+        #endregion
+
+
+        #region Constructors
+        static JsonReader ()
+        {
+            parse_table = PopulateParseTable ();
+        }
+
+        public JsonReader (string json_text) :
+            this (new StringReader (json_text), true)
+        {
+        }
+
+        public JsonReader (TextReader reader) :
+            this (reader, false)
+        {
+        }
+
+        private JsonReader (TextReader reader, bool owned)
+        {
+            if (reader == null)
+                throw new ArgumentNullException ("reader");
+
+            parser_in_string = false;
+            parser_return    = false;
+
+            read_started = false;
+            automaton_stack = new Stack<int> ();
+            automaton_stack.Push ((int) ParserToken.End);
+            automaton_stack.Push ((int) ParserToken.Text);
+
+            lexer = new Lexer (reader);
+
+            end_of_input = false;
+            end_of_json  = false;
+
+            skip_non_members = true;
+
+            this.reader = reader;
+            reader_is_owned = owned;
+        }
+        #endregion
+
+
+        #region Static Methods
+        private static IDictionary<int, IDictionary<int, int[]>> PopulateParseTable ()
+        {
+            // See section A.2. of the manual for details
+            IDictionary<int, IDictionary<int, int[]>> parse_table = new Dictionary<int, IDictionary<int, int[]>> ();
+
+            TableAddRow (parse_table, ParserToken.Array);
+            TableAddCol (parse_table, ParserToken.Array, '[',
+                            '[',
+                            (int) ParserToken.ArrayPrime);
+
+            TableAddRow (parse_table, ParserToken.ArrayPrime);
+            TableAddCol (parse_table, ParserToken.ArrayPrime, '"',
+                            (int) ParserToken.Value,
+
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, '[',
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, ']',
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, '{',
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, (int) ParserToken.Number,
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, (int) ParserToken.True,
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, (int) ParserToken.False,
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+            TableAddCol (parse_table, ParserToken.ArrayPrime, (int) ParserToken.Null,
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest,
+                            ']');
+
+            TableAddRow (parse_table, ParserToken.Object);
+            TableAddCol (parse_table, ParserToken.Object, '{',
+                            '{',
+                            (int) ParserToken.ObjectPrime);
+
+            TableAddRow (parse_table, ParserToken.ObjectPrime);
+            TableAddCol (parse_table, ParserToken.ObjectPrime, '"',
+                            (int) ParserToken.Pair,
+                            (int) ParserToken.PairRest,
+                            '}');
+            TableAddCol (parse_table, ParserToken.ObjectPrime, '}',
+                            '}');
+
+            TableAddRow (parse_table, ParserToken.Pair);
+            TableAddCol (parse_table, ParserToken.Pair, '"',
+                            (int) ParserToken.String,
+                            ':',
+                            (int) ParserToken.Value);
+
+            TableAddRow (parse_table, ParserToken.PairRest);
+            TableAddCol (parse_table, ParserToken.PairRest, ',',
+                            ',',
+                            (int) ParserToken.Pair,
+                            (int) ParserToken.PairRest);
+            TableAddCol (parse_table, ParserToken.PairRest, '}',
+                            (int) ParserToken.Epsilon);
+
+            TableAddRow (parse_table, ParserToken.String);
+            TableAddCol (parse_table, ParserToken.String, '"',
+                            '"',
+                            (int) ParserToken.CharSeq,
+                            '"');
+
+            TableAddRow (parse_table, ParserToken.Text);
+            TableAddCol (parse_table, ParserToken.Text, '[',
+                            (int) ParserToken.Array);
+            TableAddCol (parse_table, ParserToken.Text, '{',
+                            (int) ParserToken.Object);
+
+            TableAddRow (parse_table, ParserToken.Value);
+            TableAddCol (parse_table, ParserToken.Value, '"',
+                            (int) ParserToken.String);
+            TableAddCol (parse_table, ParserToken.Value, '[',
+                            (int) ParserToken.Array);
+            TableAddCol (parse_table, ParserToken.Value, '{',
+                            (int) ParserToken.Object);
+            TableAddCol (parse_table, ParserToken.Value, (int) ParserToken.Number,
+                            (int) ParserToken.Number);
+            TableAddCol (parse_table, ParserToken.Value, (int) ParserToken.True,
+                            (int) ParserToken.True);
+            TableAddCol (parse_table, ParserToken.Value, (int) ParserToken.False,
+                            (int) ParserToken.False);
+            TableAddCol (parse_table, ParserToken.Value, (int) ParserToken.Null,
+                            (int) ParserToken.Null);
+
+            TableAddRow (parse_table, ParserToken.ValueRest);
+            TableAddCol (parse_table, ParserToken.ValueRest, ',',
+                            ',',
+                            (int) ParserToken.Value,
+                            (int) ParserToken.ValueRest);
+            TableAddCol (parse_table, ParserToken.ValueRest, ']',
+                            (int) ParserToken.Epsilon);
+
+            return parse_table;
+        }
+
+        private static void TableAddCol (IDictionary<int, IDictionary<int, int[]>> parse_table, ParserToken row, int col,
+                                         params int[] symbols)
+        {
+            parse_table[(int) row].Add (col, symbols);
+        }
+
+        private static void TableAddRow (IDictionary<int, IDictionary<int, int[]>> parse_table, ParserToken rule)
+        {
+            parse_table.Add ((int) rule, new Dictionary<int, int[]> ());
+        }
+        #endregion
+
+
+        #region Private Methods
+        private void ProcessNumber (string number)
+        {
+            if (number.IndexOf ('.') != -1 ||
+                number.IndexOf ('e') != -1 ||
+                number.IndexOf ('E') != -1) {
+
+                double n_double;
+                if (double.TryParse (number, NumberStyles.Any, CultureInfo.InvariantCulture, out n_double)) {
+                    token = JsonToken.Double;
+                    token_value = n_double;
+
+                    return;
+                }
+            }
+
+            int n_int32;
+            if (int.TryParse (number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_int32)) {
+                token = JsonToken.Int;
+                token_value = n_int32;
+
+                return;
+            }
+
+            long n_int64;
+            if (long.TryParse (number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_int64)) {
+                token = JsonToken.Long;
+                token_value = n_int64;
+
+                return;
+            }
+
+            ulong n_uint64;
+            if (ulong.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_uint64))
+            {
+                token = JsonToken.Long;
+                token_value = n_uint64;
+
+                return;
+            }
+
+            // Shouldn't happen, but just in case, return something
+            token = JsonToken.Int;
+            token_value = 0;
+        }
+
+        private void ProcessSymbol ()
+        {
+            if (current_symbol == '[')  {
+                token = JsonToken.ArrayStart;
+                parser_return = true;
+
+            } else if (current_symbol == ']')  {
+                token = JsonToken.ArrayEnd;
+                parser_return = true;
+
+            } else if (current_symbol == '{')  {
+                token = JsonToken.ObjectStart;
+                parser_return = true;
+
+            } else if (current_symbol == '}')  {
+                token = JsonToken.ObjectEnd;
+                parser_return = true;
+
+            } else if (current_symbol == '"')  {
+                if (parser_in_string) {
+                    parser_in_string = false;
+
+                    parser_return = true;
+
+                } else {
+                    if (token == JsonToken.None)
+                        token = JsonToken.String;
+
+                    parser_in_string = true;
+                }
+
+            } else if (current_symbol == (int) ParserToken.CharSeq) {
+                token_value = lexer.StringValue;
+
+            } else if (current_symbol == (int) ParserToken.False)  {
+                token = JsonToken.Boolean;
+                token_value = false;
+                parser_return = true;
+
+            } else if (current_symbol == (int) ParserToken.Null)  {
+                token = JsonToken.Null;
+                parser_return = true;
+
+            } else if (current_symbol == (int) ParserToken.Number)  {
+                ProcessNumber (lexer.StringValue);
+
+                parser_return = true;
+
+            } else if (current_symbol == (int) ParserToken.Pair)  {
+                token = JsonToken.PropertyName;
+
+            } else if (current_symbol == (int) ParserToken.True)  {
+                token = JsonToken.Boolean;
+                token_value = true;
+                parser_return = true;
+
+            }
+        }
+
+        private bool ReadToken ()
+        {
+            if (end_of_input)
+                return false;
+
+            lexer.NextToken ();
+
+            if (lexer.EndOfInput) {
+                Close ();
+
+                return false;
+            }
+
+            current_input = lexer.Token;
+
+            return true;
+        }
+        #endregion
+
+
+        public void Close ()
+        {
+            if (end_of_input)
+                return;
+
+            end_of_input = true;
+            end_of_json  = true;
+
+            if (reader_is_owned)
+            {
+                using(reader){}
+            }
+
+            reader = null;
+        }
+
+        public bool Read ()
+        {
+            if (end_of_input)
+                return false;
+
+            if (end_of_json) {
+                end_of_json = false;
+                automaton_stack.Clear ();
+                automaton_stack.Push ((int) ParserToken.End);
+                automaton_stack.Push ((int) ParserToken.Text);
+            }
+
+            parser_in_string = false;
+            parser_return    = false;
+
+            token       = JsonToken.None;
+            token_value = null;
+
+            if (! read_started) {
+                read_started = true;
+
+                if (! ReadToken ())
+                    return false;
+            }
+
+
+            int[] entry_symbols;
+
+            while (true) {
+                if (parser_return) {
+                    if (automaton_stack.Peek () == (int) ParserToken.End)
+                        end_of_json = true;
+
+                    return true;
+                }
+
+                current_symbol = automaton_stack.Pop ();
+
+                ProcessSymbol ();
+
+                if (current_symbol == current_input) {
+                    if (! ReadToken ()) {
+                        if (automaton_stack.Peek () != (int) ParserToken.End)
+                            throw new JsonException (
+                                "Input doesn't evaluate to proper JSON text");
+
+                        if (parser_return)
+                            return true;
+
+                        return false;
+                    }
+
+                    continue;
+                }
+
+                try {
+
+                    entry_symbols =
+                        parse_table[current_symbol][current_input];
+
+                } catch (KeyNotFoundException e) {
+                    throw new JsonException ((ParserToken) current_input, e);
+                }
+
+                if (entry_symbols[0] == (int) ParserToken.Epsilon)
+                    continue;
+
+                for (int i = entry_symbols.Length - 1; i >= 0; i--)
+                    automaton_stack.Push (entry_symbols[i]);
+            }
+        }
+
+    }
+}
diff --git a/Librarys/litjson/litjson/JsonWriter.cs b/Librarys/litjson/litjson/JsonWriter.cs
new file mode 100644
index 0000000..7a410b3
--- /dev/null
+++ b/Librarys/litjson/litjson/JsonWriter.cs
@@ -0,0 +1,473 @@
+#region Header
+/**
+ * JsonWriter.cs
+ *   Stream-like facility to output JSON text.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+    internal enum Condition
+    {
+        InArray,
+        InObject,
+        NotAProperty,
+        Property,
+        Value
+    }
+
+    internal class WriterContext
+    {
+        public int  Count;
+        public bool InArray;
+        public bool InObject;
+        public bool ExpectingValue;
+        public int  Padding;
+    }
+
+    public class JsonWriter
+    {
+        #region Fields
+        private static readonly NumberFormatInfo number_format;
+
+        private WriterContext        context;
+        private Stack<WriterContext> ctx_stack;
+        private bool                 has_reached_end;
+        private char[]               hex_seq;
+        private int                  indentation;
+        private int                  indent_value;
+        private StringBuilder        inst_string_builder;
+        private bool                 pretty_print;
+        private bool                 validate;
+        private bool                 lower_case_properties;
+        private TextWriter           writer;
+        #endregion
+
+
+        #region Properties
+        public int IndentValue {
+            get { return indent_value; }
+            set {
+                indentation = (indentation / indent_value) * value;
+                indent_value = value;
+            }
+        }
+
+        public bool PrettyPrint {
+            get { return pretty_print; }
+            set { pretty_print = value; }
+        }
+
+        public TextWriter TextWriter {
+            get { return writer; }
+        }
+
+        public bool Validate {
+            get { return validate; }
+            set { validate = value; }
+        }
+
+        public bool LowerCaseProperties {
+            get { return lower_case_properties; }
+            set { lower_case_properties = value; }
+        }
+        #endregion
+
+
+        #region Constructors
+        static JsonWriter ()
+        {
+            number_format = NumberFormatInfo.InvariantInfo;
+        }
+
+        public JsonWriter ()
+        {
+            inst_string_builder = new StringBuilder ();
+            writer = new StringWriter (inst_string_builder);
+
+            Init ();
+        }
+
+        public JsonWriter (StringBuilder sb) :
+            this (new StringWriter (sb))
+        {
+        }
+
+        public JsonWriter (TextWriter writer)
+        {
+            if (writer == null)
+                throw new ArgumentNullException ("writer");
+
+            this.writer = writer;
+
+            Init ();
+        }
+        #endregion
+
+
+        #region Private Methods
+        private void DoValidation (Condition cond)
+        {
+            if (! context.ExpectingValue)
+                context.Count++;
+
+            if (! validate)
+                return;
+
+            if (has_reached_end)
+                throw new JsonException (
+                    "A complete JSON symbol has already been written");
+
+            switch (cond) {
+            case Condition.InArray:
+                if (! context.InArray)
+                    throw new JsonException (
+                        "Can't close an array here");
+                break;
+
+            case Condition.InObject:
+                if (! context.InObject || context.ExpectingValue)
+                    throw new JsonException (
+                        "Can't close an object here");
+                break;
+
+            case Condition.NotAProperty:
+                if (context.InObject && ! context.ExpectingValue)
+                    throw new JsonException (
+                        "Expected a property");
+                break;
+
+            case Condition.Property:
+                if (! context.InObject || context.ExpectingValue)
+                    throw new JsonException (
+                        "Can't add a property here");
+                break;
+
+            case Condition.Value:
+                if (! context.InArray &&
+                    (! context.InObject || ! context.ExpectingValue))
+                    throw new JsonException (
+                        "Can't add a value here");
+
+                break;
+            }
+        }
+
+        private void Init ()
+        {
+            has_reached_end = false;
+            hex_seq = new char[4];
+            indentation = 0;
+            indent_value = 4;
+            pretty_print = false;
+            validate = true;
+            lower_case_properties = false;
+
+            ctx_stack = new Stack<WriterContext> ();
+            context = new WriterContext ();
+            ctx_stack.Push (context);
+        }
+
+        private static void IntToHex (int n, char[] hex)
+        {
+            int num;
+
+            for (int i = 0; i < 4; i++) {
+                num = n % 16;
+
+                if (num < 10)
+                    hex[3 - i] = (char) ('0' + num);
+                else
+                    hex[3 - i] = (char) ('A' + (num - 10));
+
+                n >>= 4;
+            }
+        }
+
+        private void Indent ()
+        {
+            if (pretty_print)
+                indentation += indent_value;
+        }
+
+
+        private void Put (string str)
+        {
+            if (pretty_print && ! context.ExpectingValue)
+                for (int i = 0; i < indentation; i++)
+                    writer.Write (' ');
+
+            writer.Write (str);
+        }
+
+        private void PutNewline ()
+        {
+            PutNewline (true);
+        }
+
+        private void PutNewline (bool add_comma)
+        {
+            if (add_comma && ! context.ExpectingValue &&
+                context.Count > 1)
+                writer.Write (',');
+
+            if (pretty_print && ! context.ExpectingValue)
+                writer.Write (Environment.NewLine);
+        }
+
+        private void PutString (string str)
+        {
+            Put (String.Empty);
+
+            writer.Write ('"');
+
+            int n = str.Length;
+            for (int i = 0; i < n; i++) {
+                switch (str[i]) {
+                case '\n':
+                    writer.Write ("\\n");
+                    continue;
+
+                case '\r':
+                    writer.Write ("\\r");
+                    continue;
+
+                case '\t':
+                    writer.Write ("\\t");
+                    continue;
+
+                case '"':
+                case '\\':
+                    writer.Write ('\\');
+                    writer.Write (str[i]);
+                    continue;
+
+                case '\f':
+                    writer.Write ("\\f");
+                    continue;
+
+                case '\b':
+                    writer.Write ("\\b");
+                    continue;
+                }
+
+                if ((int) str[i] >= 32 && (int) str[i] <= 126) {
+                    writer.Write (str[i]);
+                    continue;
+                }
+
+                // Default, turn into a \uXXXX sequence
+                IntToHex ((int) str[i], hex_seq);
+                writer.Write ("\\u");
+                writer.Write (hex_seq);
+            }
+
+            writer.Write ('"');
+        }
+
+        private void Unindent ()
+        {
+            if (pretty_print)
+                indentation -= indent_value;
+        }
+        #endregion
+
+
+        public override string ToString ()
+        {
+            if (inst_string_builder == null)
+                return String.Empty;
+
+            return inst_string_builder.ToString ();
+        }
+
+        public void Reset ()
+        {
+            has_reached_end = false;
+
+            ctx_stack.Clear ();
+            context = new WriterContext ();
+            ctx_stack.Push (context);
+
+            if (inst_string_builder != null)
+                inst_string_builder.Remove (0, inst_string_builder.Length);
+        }
+
+        public void Write (bool boolean)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            Put (boolean ? "true" : "false");
+
+            context.ExpectingValue = false;
+        }
+
+        public void Write (decimal number)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            Put (Convert.ToString (number, number_format));
+
+            context.ExpectingValue = false;
+        }
+
+        public void Write (double number)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            string str = Convert.ToString (number, number_format);
+            Put (str);
+
+            if (str.IndexOf ('.') == -1 &&
+                str.IndexOf ('E') == -1)
+                writer.Write (".0");
+
+            context.ExpectingValue = false;
+        }
+
+        public void Write (int number)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            Put (Convert.ToString (number, number_format));
+
+            context.ExpectingValue = false;
+        }
+
+        public void Write (long number)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            Put (Convert.ToString (number, number_format));
+
+            context.ExpectingValue = false;
+        }
+
+        public void Write (string str)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            if (str == null)
+                Put ("null");
+            else
+                PutString (str);
+
+            context.ExpectingValue = false;
+        }
+
+        [CLSCompliant(false)]
+        public void Write (ulong number)
+        {
+            DoValidation (Condition.Value);
+            PutNewline ();
+
+            Put (Convert.ToString (number, number_format));
+
+            context.ExpectingValue = false;
+        }
+
+        public void WriteArrayEnd ()
+        {
+            DoValidation (Condition.InArray);
+            PutNewline (false);
+
+            ctx_stack.Pop ();
+            if (ctx_stack.Count == 1)
+                has_reached_end = true;
+            else {
+                context = ctx_stack.Peek ();
+                context.ExpectingValue = false;
+            }
+
+            Unindent ();
+            Put ("]");
+        }
+
+        public void WriteArrayStart ()
+        {
+            DoValidation (Condition.NotAProperty);
+            PutNewline ();
+
+            Put ("[");
+
+            context = new WriterContext ();
+            context.InArray = true;
+            ctx_stack.Push (context);
+
+            Indent ();
+        }
+
+        public void WriteObjectEnd ()
+        {
+            DoValidation (Condition.InObject);
+            PutNewline (false);
+
+            ctx_stack.Pop ();
+            if (ctx_stack.Count == 1)
+                has_reached_end = true;
+            else {
+                context = ctx_stack.Peek ();
+                context.ExpectingValue = false;
+            }
+
+            Unindent ();
+            Put ("}");
+        }
+
+        public void WriteObjectStart ()
+        {
+            DoValidation (Condition.NotAProperty);
+            PutNewline ();
+
+            Put ("{");
+
+            context = new WriterContext ();
+            context.InObject = true;
+            ctx_stack.Push (context);
+
+            Indent ();
+        }
+
+        public void WritePropertyName (string property_name)
+        {
+            DoValidation (Condition.Property);
+            PutNewline ();
+            string propertyName = (property_name == null || !lower_case_properties)
+                ? property_name
+                : property_name.ToLowerInvariant();
+
+            PutString (propertyName);
+
+            if (pretty_print) {
+                if (propertyName.Length > context.Padding)
+                    context.Padding = propertyName.Length;
+
+                for (int i = context.Padding - propertyName.Length;
+                     i >= 0; i--)
+                    writer.Write (' ');
+
+                writer.Write (": ");
+            } else
+                writer.Write (':');
+
+            context.ExpectingValue = true;
+        }
+    }
+}
diff --git a/Librarys/litjson/litjson/Lexer.cs b/Librarys/litjson/litjson/Lexer.cs
new file mode 100644
index 0000000..cb62d55
--- /dev/null
+++ b/Librarys/litjson/litjson/Lexer.cs
@@ -0,0 +1,912 @@
+#region Header
+/**
+ * Lexer.cs
+ *   JSON lexer implementation based on a finite state machine.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+    internal class FsmContext
+    {
+        public bool  Return;
+        public int   NextState;
+        public Lexer L;
+        public int   StateStack;
+    }
+
+
+    internal class Lexer
+    {
+        #region Fields
+        private delegate bool StateHandler (FsmContext ctx);
+
+        private static readonly int[]          fsm_return_table;
+        private static readonly StateHandler[] fsm_handler_table;
+
+        private bool          allow_comments;
+        private bool          allow_single_quoted_strings;
+        private bool          end_of_input;
+        private FsmContext    fsm_context;
+        private int           input_buffer;
+        private int           input_char;
+        private TextReader    reader;
+        private int           state;
+        private StringBuilder string_buffer;
+        private string        string_value;
+        private int           token;
+        private int           unichar;
+        #endregion
+
+
+        #region Properties
+        public bool AllowComments {
+            get { return allow_comments; }
+            set { allow_comments = value; }
+        }
+
+        public bool AllowSingleQuotedStrings {
+            get { return allow_single_quoted_strings; }
+            set { allow_single_quoted_strings = value; }
+        }
+
+        public bool EndOfInput {
+            get { return end_of_input; }
+        }
+
+        public int Token {
+            get { return token; }
+        }
+
+        public string StringValue {
+            get { return string_value; }
+        }
+        #endregion
+
+
+        #region Constructors
+        static Lexer ()
+        {
+            PopulateFsmTables (out fsm_handler_table, out fsm_return_table);
+        }
+
+        public Lexer (TextReader reader)
+        {
+            allow_comments = true;
+            allow_single_quoted_strings = true;
+
+            input_buffer = 0;
+            string_buffer = new StringBuilder (128);
+            state = 1;
+            end_of_input = false;
+            this.reader = reader;
+
+            fsm_context = new FsmContext ();
+            fsm_context.L = this;
+        }
+        #endregion
+
+
+        #region Static Methods
+        private static int HexValue (int digit)
+        {
+            switch (digit) {
+            case 'a':
+            case 'A':
+                return 10;
+
+            case 'b':
+            case 'B':
+                return 11;
+
+            case 'c':
+            case 'C':
+                return 12;
+
+            case 'd':
+            case 'D':
+                return 13;
+
+            case 'e':
+            case 'E':
+                return 14;
+
+            case 'f':
+            case 'F':
+                return 15;
+
+            default:
+                return digit - '0';
+            }
+        }
+
+        private static void PopulateFsmTables (out StateHandler[] fsm_handler_table, out int[] fsm_return_table)
+        {
+            // See section A.1. of the manual for details of the finite
+            // state machine.
+            fsm_handler_table = new StateHandler[28] {
+                State1,
+                State2,
+                State3,
+                State4,
+                State5,
+                State6,
+                State7,
+                State8,
+                State9,
+                State10,
+                State11,
+                State12,
+                State13,
+                State14,
+                State15,
+                State16,
+                State17,
+                State18,
+                State19,
+                State20,
+                State21,
+                State22,
+                State23,
+                State24,
+                State25,
+                State26,
+                State27,
+                State28
+            };
+
+            fsm_return_table = new int[28] {
+                (int) ParserToken.Char,
+                0,
+                (int) ParserToken.Number,
+                (int) ParserToken.Number,
+                0,
+                (int) ParserToken.Number,
+                0,
+                (int) ParserToken.Number,
+                0,
+                0,
+                (int) ParserToken.True,
+                0,
+                0,
+                0,
+                (int) ParserToken.False,
+                0,
+                0,
+                (int) ParserToken.Null,
+                (int) ParserToken.CharSeq,
+                (int) ParserToken.Char,
+                0,
+                0,
+                (int) ParserToken.CharSeq,
+                (int) ParserToken.Char,
+                0,
+                0,
+                0,
+                0
+            };
+        }
+
+        private static char ProcessEscChar (int esc_char)
+        {
+            switch (esc_char) {
+            case '"':
+            case '\'':
+            case '\\':
+            case '/':
+                return Convert.ToChar (esc_char);
+
+            case 'n':
+                return '\n';
+
+            case 't':
+                return '\t';
+
+            case 'r':
+                return '\r';
+
+            case 'b':
+                return '\b';
+
+            case 'f':
+                return '\f';
+
+            default:
+                // Unreachable
+                return '?';
+            }
+        }
+
+        private static bool State1 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char == ' ' ||
+                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r')
+                    continue;
+
+                if (ctx.L.input_char >= '1' && ctx.L.input_char <= '9') {
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 3;
+                    return true;
+                }
+
+                switch (ctx.L.input_char) {
+                case '"':
+                    ctx.NextState = 19;
+                    ctx.Return = true;
+                    return true;
+
+                case ',':
+                case ':':
+                case '[':
+                case ']':
+                case '{':
+                case '}':
+                    ctx.NextState = 1;
+                    ctx.Return = true;
+                    return true;
+
+                case '-':
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 2;
+                    return true;
+
+                case '0':
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 4;
+                    return true;
+
+                case 'f':
+                    ctx.NextState = 12;
+                    return true;
+
+                case 'n':
+                    ctx.NextState = 16;
+                    return true;
+
+                case 't':
+                    ctx.NextState = 9;
+                    return true;
+
+                case '\'':
+                    if (! ctx.L.allow_single_quoted_strings)
+                        return false;
+
+                    ctx.L.input_char = '"';
+                    ctx.NextState = 23;
+                    ctx.Return = true;
+                    return true;
+
+                case '/':
+                    if (! ctx.L.allow_comments)
+                        return false;
+
+                    ctx.NextState = 25;
+                    return true;
+
+                default:
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State2 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            if (ctx.L.input_char >= '1' && ctx.L.input_char<= '9') {
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 3;
+                return true;
+            }
+
+            switch (ctx.L.input_char) {
+            case '0':
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 4;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State3 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    continue;
+                }
+
+                if (ctx.L.input_char == ' ' ||
+                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+                }
+
+                switch (ctx.L.input_char) {
+                case ',':
+                case ']':
+                case '}':
+                    ctx.L.UngetChar ();
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+
+                case '.':
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 5;
+                    return true;
+
+                case 'e':
+                case 'E':
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 7;
+                    return true;
+
+                default:
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private static bool State4 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            if (ctx.L.input_char == ' ' ||
+                ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+            }
+
+            switch (ctx.L.input_char) {
+            case ',':
+            case ']':
+            case '}':
+                ctx.L.UngetChar ();
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            case '.':
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 5;
+                return true;
+
+            case 'e':
+            case 'E':
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 7;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State5 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 6;
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool State6 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    continue;
+                }
+
+                if (ctx.L.input_char == ' ' ||
+                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+                }
+
+                switch (ctx.L.input_char) {
+                case ',':
+                case ']':
+                case '}':
+                    ctx.L.UngetChar ();
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+
+                case 'e':
+                case 'E':
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    ctx.NextState = 7;
+                    return true;
+
+                default:
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State7 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 8;
+                return true;
+            }
+
+            switch (ctx.L.input_char) {
+            case '+':
+            case '-':
+                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                ctx.NextState = 8;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State8 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    continue;
+                }
+
+                if (ctx.L.input_char == ' ' ||
+                    ctx.L.input_char >= '\t' && ctx.L.input_char<= '\r') {
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+                }
+
+                switch (ctx.L.input_char) {
+                case ',':
+                case ']':
+                case '}':
+                    ctx.L.UngetChar ();
+                    ctx.Return = true;
+                    ctx.NextState = 1;
+                    return true;
+
+                default:
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State9 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'r':
+                ctx.NextState = 10;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State10 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'u':
+                ctx.NextState = 11;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State11 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'e':
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State12 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'a':
+                ctx.NextState = 13;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State13 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'l':
+                ctx.NextState = 14;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State14 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 's':
+                ctx.NextState = 15;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State15 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'e':
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State16 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'u':
+                ctx.NextState = 17;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State17 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'l':
+                ctx.NextState = 18;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State18 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'l':
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State19 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                switch (ctx.L.input_char) {
+                case '"':
+                    ctx.L.UngetChar ();
+                    ctx.Return = true;
+                    ctx.NextState = 20;
+                    return true;
+
+                case '\\':
+                    ctx.StateStack = 19;
+                    ctx.NextState = 21;
+                    return true;
+
+                default:
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    continue;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State20 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case '"':
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State21 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case 'u':
+                ctx.NextState = 22;
+                return true;
+
+            case '"':
+            case '\'':
+            case '/':
+            case '\\':
+            case 'b':
+            case 'f':
+            case 'n':
+            case 'r':
+            case 't':
+                ctx.L.string_buffer.Append (
+                    ProcessEscChar (ctx.L.input_char));
+                ctx.NextState = ctx.StateStack;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State22 (FsmContext ctx)
+        {
+            int counter = 0;
+            int mult    = 4096;
+
+            ctx.L.unichar = 0;
+
+            while (ctx.L.GetChar ()) {
+
+                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9' ||
+                    ctx.L.input_char >= 'A' && ctx.L.input_char <= 'F' ||
+                    ctx.L.input_char >= 'a' && ctx.L.input_char <= 'f') {
+
+                    ctx.L.unichar += HexValue (ctx.L.input_char) * mult;
+
+                    counter++;
+                    mult /= 16;
+
+                    if (counter == 4) {
+                        ctx.L.string_buffer.Append (
+                            Convert.ToChar (ctx.L.unichar));
+                        ctx.NextState = ctx.StateStack;
+                        return true;
+                    }
+
+                    continue;
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private static bool State23 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                switch (ctx.L.input_char) {
+                case '\'':
+                    ctx.L.UngetChar ();
+                    ctx.Return = true;
+                    ctx.NextState = 24;
+                    return true;
+
+                case '\\':
+                    ctx.StateStack = 23;
+                    ctx.NextState = 21;
+                    return true;
+
+                default:
+                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+                    continue;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State24 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case '\'':
+                ctx.L.input_char = '"';
+                ctx.Return = true;
+                ctx.NextState = 1;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State25 (FsmContext ctx)
+        {
+            ctx.L.GetChar ();
+
+            switch (ctx.L.input_char) {
+            case '*':
+                ctx.NextState = 27;
+                return true;
+
+            case '/':
+                ctx.NextState = 26;
+                return true;
+
+            default:
+                return false;
+            }
+        }
+
+        private static bool State26 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char == '\n') {
+                    ctx.NextState = 1;
+                    return true;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State27 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char == '*') {
+                    ctx.NextState = 28;
+                    return true;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool State28 (FsmContext ctx)
+        {
+            while (ctx.L.GetChar ()) {
+                if (ctx.L.input_char == '*')
+                    continue;
+
+                if (ctx.L.input_char == '/') {
+                    ctx.NextState = 1;
+                    return true;
+                }
+
+                ctx.NextState = 27;
+                return true;
+            }
+
+            return true;
+        }
+        #endregion
+
+
+        private bool GetChar ()
+        {
+            if ((input_char = NextChar ()) != -1)
+                return true;
+
+            end_of_input = true;
+            return false;
+        }
+
+        private int NextChar ()
+        {
+            if (input_buffer != 0) {
+                int tmp = input_buffer;
+                input_buffer = 0;
+
+                return tmp;
+            }
+
+            return reader.Read ();
+        }
+
+        public bool NextToken ()
+        {
+            StateHandler handler;
+            fsm_context.Return = false;
+
+            while (true) {
+                handler = fsm_handler_table[state - 1];
+
+                if (! handler (fsm_context))
+                    throw new JsonException (input_char);
+
+                if (end_of_input)
+                    return false;
+
+                if (fsm_context.Return) {
+                    string_value = string_buffer.ToString ();
+                    string_buffer.Remove (0, string_buffer.Length);
+                    token = fsm_return_table[state - 1];
+
+                    if (token == (int) ParserToken.Char)
+                        token = input_char;
+
+                    state = fsm_context.NextState;
+
+                    return true;
+                }
+
+                state = fsm_context.NextState;
+            }
+        }
+
+        private void UngetChar ()
+        {
+            input_buffer = input_char;
+        }
+    }
+}
diff --git a/Librarys/litjson/litjson/Netstandard15Polyfill.cs b/Librarys/litjson/litjson/Netstandard15Polyfill.cs
new file mode 100644
index 0000000..55b02a2
--- /dev/null
+++ b/Librarys/litjson/litjson/Netstandard15Polyfill.cs
@@ -0,0 +1,24 @@
+#if NETSTANDARD1_5
+using System;
+using System.Reflection;
+namespace LitJson
+{
+    internal static class Netstandard15Polyfill
+    {
+        internal static Type GetInterface(this Type type, string name)
+        {
+            return type.GetTypeInfo().GetInterface(name); 
+        }
+
+        internal static bool IsClass(this Type type)
+        {
+            return type.GetTypeInfo().IsClass;
+        }
+
+        internal static bool IsEnum(this Type type)
+        {
+            return type.GetTypeInfo().IsEnum;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Librarys/litjson/litjson/ParserToken.cs b/Librarys/litjson/litjson/ParserToken.cs
new file mode 100644
index 0000000..e23d477
--- /dev/null
+++ b/Librarys/litjson/litjson/ParserToken.cs
@@ -0,0 +1,44 @@
+#region Header
+/**
+ * ParserToken.cs
+ *   Internal representation of the tokens used by the lexer and the parser.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+namespace LitJson
+{
+    internal enum ParserToken
+    {
+        // Lexer tokens (see section A.1.1. of the manual)
+        None = System.Char.MaxValue + 1,
+        Number,
+        True,
+        False,
+        Null,
+        CharSeq,
+        // Single char
+        Char,
+
+        // Parser Rules (see section A.2.1 of the manual)
+        Text,
+        Object,
+        ObjectPrime,
+        Pair,
+        PairRest,
+        Array,
+        ArrayPrime,
+        Value,
+        ValueRest,
+        String,
+
+        // End of input
+        End,
+
+        // The empty rule
+        Epsilon
+    }
+}
diff --git a/Librarys/litjson/litjson/Properties/AssemblyInfo.cs b/Librarys/litjson/litjson/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..08bd808
--- /dev/null
+++ b/Librarys/litjson/litjson/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("LitJson")]
+[assembly: AssemblyDescription("LitJSON library")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("LitJSON")]
+[assembly: AssemblyCopyright("The authors disclaim copyright to this source code")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("91a14cd2-2940-4500-8193-56d37edddbaa")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.12.0")]
+[assembly: AssemblyFileVersion("0.12.0")]
diff --git a/Librarys/litjson/litjson/bin/Release/litjson.dll b/Librarys/litjson/litjson/bin/Release/litjson.dll
new file mode 100644
index 0000000..d2229a7
Binary files /dev/null and b/Librarys/litjson/litjson/bin/Release/litjson.dll differ
diff --git a/Librarys/litjson/litjson/litjson_4.7.1.csproj b/Librarys/litjson/litjson/litjson_4.7.1.csproj
new file mode 100644
index 0000000..ab50131
--- /dev/null
+++ b/Librarys/litjson/litjson/litjson_4.7.1.csproj
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{91A14CD2-2940-4500-8193-56D37EDDDBAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LitJson</RootNamespace>
+    <AssemblyName>litjson</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IJsonWrapper.cs" />
+    <Compile Include="JsonData.cs" />
+    <Compile Include="JsonException.cs" />
+    <Compile Include="JsonMapper.cs" />
+    <Compile Include="JsonMockWrapper.cs" />
+    <Compile Include="JsonReader.cs" />
+    <Compile Include="JsonWriter.cs" />
+    <Compile Include="Lexer.cs" />
+    <Compile Include="Netstandard15Polyfill.cs" />
+    <Compile Include="ParserToken.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt.sln b/Librarys/mqtt/M2Mqtt.sln
new file mode 100644
index 0000000..9d4babd
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {135814CF-A469-4436-9C51-3CFE4B93D2FE}
+	EndGlobalSection
+EndGlobal
diff --git a/Librarys/mqtt/M2Mqtt/Exceptions/MqttClientException.cs b/Librarys/mqtt/M2Mqtt/Exceptions/MqttClientException.cs
new file mode 100644
index 0000000..cd8303f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Exceptions/MqttClientException.cs
@@ -0,0 +1,132 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+
+namespace uPLibrary.Networking.M2Mqtt.Exceptions
+{
+    /// <summary>
+    /// MQTT client exception
+    /// </summary>
+    public class MqttClientException : Exception
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="code">Error code</param>
+        public MqttClientException(MqttClientErrorCode errorCode)
+        {
+            this.errorCode = errorCode;
+        }
+
+        // error code
+        private MqttClientErrorCode errorCode;
+
+        /// <summary>
+        /// Error code
+        /// </summary>
+        public MqttClientErrorCode ErrorCode
+        {
+            get { return this.errorCode; }
+            set { this.errorCode = value; }
+        }
+    }
+
+    /// <summary>
+    /// MQTT client erroro code
+    /// </summary>
+    public enum MqttClientErrorCode
+    {
+        /// <summary>
+        /// Will error (topic, message or QoS level)
+        /// </summary>
+        WillWrong = 1,
+
+        /// <summary>
+        /// Keep alive period too large
+        /// </summary>
+        KeepAliveWrong,
+
+        /// <summary>
+        /// Topic contains wildcards
+        /// </summary>
+        TopicWildcard,
+
+        /// <summary>
+        /// Topic length wrong
+        /// </summary>
+        TopicLength,
+
+        /// <summary>
+        /// QoS level not allowed
+        /// </summary>
+        QosNotAllowed,
+
+        /// <summary>
+        /// Topics list empty for subscribe
+        /// </summary>
+        TopicsEmpty,
+
+        /// <summary>
+        /// Qos levels list empty for subscribe
+        /// </summary>
+        QosLevelsEmpty,
+
+        /// <summary>
+        /// Topics / Qos Levels not match in subscribe
+        /// </summary>
+        TopicsQosLevelsNotMatch,
+
+        /// <summary>
+        /// Wrong message from broker
+        /// </summary>
+        WrongBrokerMessage,
+
+        /// <summary>
+        /// Wrong Message Id
+        /// </summary>
+        WrongMessageId,
+
+        /// <summary>
+        /// Inflight queue is full
+        /// </summary>
+        InflightQueueFull,
+
+        // [v3.1.1]
+        /// <summary>
+        /// Invalid flag bits received 
+        /// </summary>
+        InvalidFlagBits,
+
+        // [v3.1.1]
+        /// <summary>
+        /// Invalid connect flags received
+        /// </summary>
+        InvalidConnectFlags,
+
+        // [v3.1.1]
+        /// <summary>
+        /// Invalid client id
+        /// </summary>
+        InvalidClientId,
+
+        // [v3.1.1]
+        /// <summary>
+        /// Invalid protocol name
+        /// </summary>
+        InvalidProtocolName
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Exceptions/MqttCommunicationException.cs b/Librarys/mqtt/M2Mqtt/Exceptions/MqttCommunicationException.cs
new file mode 100644
index 0000000..6b916cc
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Exceptions/MqttCommunicationException.cs
@@ -0,0 +1,42 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+
+namespace uPLibrary.Networking.M2Mqtt.Exceptions
+{
+    /// <summary>
+    /// Exception due to error communication with broker on socket
+    /// </summary>
+    public class MqttCommunicationException : Exception
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public MqttCommunicationException()
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="e">Inner Exception</param>
+        public MqttCommunicationException(Exception e)
+            : base(String.Empty, e)
+        {
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Exceptions/MqttConnectionException.cs b/Librarys/mqtt/M2Mqtt/Exceptions/MqttConnectionException.cs
new file mode 100644
index 0000000..3203c7e
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Exceptions/MqttConnectionException.cs
@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+
+namespace uPLibrary.Networking.M2Mqtt.Exceptions
+{
+    /// <summary>
+    /// Connection to the broker exception
+    /// </summary>
+    public class MqttConnectionException : Exception
+    {
+        public MqttConnectionException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Exceptions/MqttTimeoutException.cs b/Librarys/mqtt/M2Mqtt/Exceptions/MqttTimeoutException.cs
new file mode 100644
index 0000000..b15e69e
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Exceptions/MqttTimeoutException.cs
@@ -0,0 +1,27 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+
+namespace uPLibrary.Networking.M2Mqtt.Exceptions
+{
+    /// <summary>
+    /// Timeout on receiving from broker exception
+    /// </summary>
+    public class MqttTimeoutException : Exception
+    {
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/IMqttNetworkChannel.cs b/Librarys/mqtt/M2Mqtt/IMqttNetworkChannel.cs
new file mode 100644
index 0000000..f4ff90f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/IMqttNetworkChannel.cs
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Text;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Interface for channel under MQTT library
+    /// </summary>
+    public interface IMqttNetworkChannel
+    {
+        /// <summary>
+        /// Data available on channel
+        /// </summary>
+        bool DataAvailable { get; }
+
+        /// <summary>
+        /// Receive data from the network channel
+        /// </summary>
+        /// <param name="buffer">Data buffer for receiving data</param>
+        /// <returns>Number of bytes received</returns>
+        int Receive(byte[] buffer);
+
+        /// <summary>
+        /// Receive data from the network channel with a specified timeout
+        /// </summary>
+        /// <param name="buffer">Data buffer for receiving data</param>
+        /// <param name="timeout">Timeout on receiving (in milliseconds)</param>
+        /// <returns>Number of bytes received</returns>
+        int Receive(byte[] buffer, int timeout);
+
+        /// <summary>
+        /// Send data on the network channel to the broker
+        /// </summary>
+        /// <param name="buffer">Data buffer to send</param>
+        /// <returns>Number of byte sent</returns>
+        int Send(byte[] buffer);
+
+        /// <summary>
+        /// Close the network channel
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// Connect to remote server
+        /// </summary>
+        void Connect();
+        
+        /// <summary>
+        /// Accept client connection
+        /// </summary>
+        void Accept();
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Internal/InternalEvent.cs b/Librarys/mqtt/M2Mqtt/Internal/InternalEvent.cs
new file mode 100644
index 0000000..7f298c7
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Internal/InternalEvent.cs
@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+namespace uPLibrary.Networking.M2Mqtt.Internal
+{
+    /// <summary>
+    /// Generic internal event for dispatching
+    /// </summary>
+    public abstract class InternalEvent
+    {
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Internal/MsgInternalEvent.cs b/Librarys/mqtt/M2Mqtt/Internal/MsgInternalEvent.cs
new file mode 100644
index 0000000..8cf46a4
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Internal/MsgInternalEvent.cs
@@ -0,0 +1,51 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Messages;
+
+namespace uPLibrary.Networking.M2Mqtt.Internal
+{
+    /// <summary>
+    /// Internal event with a message
+    /// </summary>
+    public class MsgInternalEvent : InternalEvent
+    {
+        #region Properties ...
+
+        /// <summary>
+        /// Related message
+        /// </summary>
+        public MqttMsgBase Message
+        {
+            get { return this.msg; }
+            set { this.msg = value; }
+        }
+
+        #endregion
+
+        // related message
+        protected MqttMsgBase msg;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="msg">Related message</param>
+        public MsgInternalEvent(MqttMsgBase msg)
+        {
+            this.msg = msg;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Internal/MsgPublishedInternalEvent.cs b/Librarys/mqtt/M2Mqtt/Internal/MsgPublishedInternalEvent.cs
new file mode 100644
index 0000000..5a7f182
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Internal/MsgPublishedInternalEvent.cs
@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Messages;
+
+namespace uPLibrary.Networking.M2Mqtt.Internal
+{
+    /// <summary>
+    /// Internal event for a published message
+    /// </summary>
+    public class MsgPublishedInternalEvent : MsgInternalEvent
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message published (or failed due to retries)
+        /// </summary>
+        public bool IsPublished
+        {
+            get { return this.isPublished; }
+            internal set { this.isPublished = value; }
+        }
+
+        #endregion
+
+        // published flag
+        bool isPublished;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="msg">Message published</param>
+        /// <param name="isPublished">Publish flag</param>
+        public MsgPublishedInternalEvent(MqttMsgBase msg, bool isPublished) 
+            : base(msg)
+        {
+            this.isPublished = isPublished;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/M2Mqtt.csproj b/Librarys/mqtt/M2Mqtt/M2Mqtt.csproj
new file mode 100644
index 0000000..62f1b4f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/M2Mqtt.csproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A11AEF5A-B246-4FE8-8330-06DB73CC8074}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>uPLibrary.Networking.M2Mqtt</RootNamespace>
+    <AssemblyName>M2Mqtt</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\4.7.1\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\4.7.1\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Exceptions\MqttClientException.cs" />
+    <Compile Include="Exceptions\MqttCommunicationException.cs" />
+    <Compile Include="Exceptions\MqttConnectionException.cs" />
+    <Compile Include="Exceptions\MqttTimeoutException.cs" />
+    <Compile Include="IMqttNetworkChannel.cs" />
+    <Compile Include="Internal\InternalEvent.cs" />
+    <Compile Include="Internal\MsgInternalEvent.cs" />
+    <Compile Include="Internal\MsgPublishedInternalEvent.cs" />
+    <Compile Include="Messages\MqttMsgBase.cs" />
+    <Compile Include="Messages\MqttMsgConnack.cs" />
+    <Compile Include="Messages\MqttMsgConnect.cs" />
+    <Compile Include="Messages\MqttMsgConnectEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgContext.cs" />
+    <Compile Include="Messages\MqttMsgDisconnect.cs" />
+    <Compile Include="Messages\MqttMsgPingReq.cs" />
+    <Compile Include="Messages\MqttMsgPingResp.cs" />
+    <Compile Include="Messages\MqttMsgPuback.cs" />
+    <Compile Include="Messages\MqttMsgPubcomp.cs" />
+    <Compile Include="Messages\MqttMsgPublish.cs" />
+    <Compile Include="Messages\MqttMsgPublishedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgPublishEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgPubrec.cs" />
+    <Compile Include="Messages\MqttMsgPubrel.cs" />
+    <Compile Include="Messages\MqttMsgSuback.cs" />
+    <Compile Include="Messages\MqttMsgSubscribe.cs" />
+    <Compile Include="Messages\MqttMsgSubscribedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgSubscribeEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgUnsuback.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribe.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribeEventArgs.cs" />
+    <Compile Include="MqttClient.cs" />
+    <Compile Include="MqttSecurity.cs" />
+    <Compile Include="Net\Fx.cs" />
+    <Compile Include="Net\MqttNetworkChannel.cs" />
+    <Compile Include="MqttSettings.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session\MqttBrokerSession.cs" />
+    <Compile Include="Session\MqttClientSession.cs" />
+    <Compile Include="Session\MqttSession.cs" />
+    <Compile Include="Utility\Trace.cs" />
+    <Compile Include="Utility\QueueExtension.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt/M2Mqtt_2.csproj b/Librarys/mqtt/M2Mqtt/M2Mqtt_2.csproj
new file mode 100644
index 0000000..aa13646
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/M2Mqtt_2.csproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A11AEF5A-B246-4FE8-8330-06DB73CC8074}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>uPLibrary.Networking.M2Mqtt</RootNamespace>
+    <AssemblyName>M2Mqtt</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\2.0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\2.0\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Exceptions\MqttClientException.cs" />
+    <Compile Include="Exceptions\MqttCommunicationException.cs" />
+    <Compile Include="Exceptions\MqttConnectionException.cs" />
+    <Compile Include="Exceptions\MqttTimeoutException.cs" />
+    <Compile Include="IMqttNetworkChannel.cs" />
+    <Compile Include="Internal\InternalEvent.cs" />
+    <Compile Include="Internal\MsgInternalEvent.cs" />
+    <Compile Include="Internal\MsgPublishedInternalEvent.cs" />
+    <Compile Include="Messages\MqttMsgBase.cs" />
+    <Compile Include="Messages\MqttMsgConnack.cs" />
+    <Compile Include="Messages\MqttMsgConnect.cs" />
+    <Compile Include="Messages\MqttMsgConnectEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgContext.cs" />
+    <Compile Include="Messages\MqttMsgDisconnect.cs" />
+    <Compile Include="Messages\MqttMsgPingReq.cs" />
+    <Compile Include="Messages\MqttMsgPingResp.cs" />
+    <Compile Include="Messages\MqttMsgPuback.cs" />
+    <Compile Include="Messages\MqttMsgPubcomp.cs" />
+    <Compile Include="Messages\MqttMsgPublish.cs" />
+    <Compile Include="Messages\MqttMsgPublishedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgPublishEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgPubrec.cs" />
+    <Compile Include="Messages\MqttMsgPubrel.cs" />
+    <Compile Include="Messages\MqttMsgSuback.cs" />
+    <Compile Include="Messages\MqttMsgSubscribe.cs" />
+    <Compile Include="Messages\MqttMsgSubscribedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgSubscribeEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgUnsuback.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribe.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribedEventArgs.cs" />
+    <Compile Include="Messages\MqttMsgUnsubscribeEventArgs.cs" />
+    <Compile Include="MqttClient.cs" />
+    <Compile Include="MqttSecurity.cs" />
+    <Compile Include="Net\Fx.cs" />
+    <Compile Include="Net\MqttNetworkChannel.cs" />
+    <Compile Include="MqttSettings.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session\MqttBrokerSession.cs" />
+    <Compile Include="Session\MqttClientSession.cs" />
+    <Compile Include="Session\MqttSession.cs" />
+    <Compile Include="Utility\Trace.cs" />
+    <Compile Include="Utility\QueueExtension.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgBase.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgBase.cs
new file mode 100644
index 0000000..870fe5f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgBase.cs
@@ -0,0 +1,275 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Text;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Base class for all MQTT messages
+    /// </summary>
+    public abstract class MqttMsgBase
+    {
+        #region Constants...
+
+        // mask, offset and size for fixed header fields
+        internal const byte MSG_TYPE_MASK = 0xF0;
+        internal const byte MSG_TYPE_OFFSET = 0x04;
+        internal const byte MSG_TYPE_SIZE = 0x04;
+        internal const byte MSG_FLAG_BITS_MASK = 0x0F;      // [v3.1.1]
+        internal const byte MSG_FLAG_BITS_OFFSET = 0x00;    // [v3.1.1]
+        internal const byte MSG_FLAG_BITS_SIZE = 0x04;      // [v3.1.1]
+        internal const byte DUP_FLAG_MASK = 0x08;
+        internal const byte DUP_FLAG_OFFSET = 0x03;
+        internal const byte DUP_FLAG_SIZE = 0x01;
+        internal const byte QOS_LEVEL_MASK = 0x06;
+        internal const byte QOS_LEVEL_OFFSET = 0x01;
+        internal const byte QOS_LEVEL_SIZE = 0x02;
+        internal const byte RETAIN_FLAG_MASK = 0x01;
+        internal const byte RETAIN_FLAG_OFFSET = 0x00;
+        internal const byte RETAIN_FLAG_SIZE = 0x01;
+
+        // MQTT message types
+        internal const byte MQTT_MSG_CONNECT_TYPE = 0x01;
+        internal const byte MQTT_MSG_CONNACK_TYPE = 0x02;
+        internal const byte MQTT_MSG_PUBLISH_TYPE = 0x03;
+        internal const byte MQTT_MSG_PUBACK_TYPE = 0x04;
+        internal const byte MQTT_MSG_PUBREC_TYPE = 0x05;
+        internal const byte MQTT_MSG_PUBREL_TYPE = 0x06;
+        internal const byte MQTT_MSG_PUBCOMP_TYPE = 0x07;
+        internal const byte MQTT_MSG_SUBSCRIBE_TYPE = 0x08;
+        internal const byte MQTT_MSG_SUBACK_TYPE = 0x09;
+        internal const byte MQTT_MSG_UNSUBSCRIBE_TYPE = 0x0A;
+        internal const byte MQTT_MSG_UNSUBACK_TYPE = 0x0B;
+        internal const byte MQTT_MSG_PINGREQ_TYPE = 0x0C;
+        internal const byte MQTT_MSG_PINGRESP_TYPE = 0x0D;
+        internal const byte MQTT_MSG_DISCONNECT_TYPE = 0x0E;
+
+        // [v3.1.1] MQTT flag bits
+        internal const byte MQTT_MSG_CONNECT_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_CONNACK_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_PUBLISH_FLAG_BITS = 0x00; // just defined as 0x00 but depends on publish props (dup, qos, retain) 
+        internal const byte MQTT_MSG_PUBACK_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_PUBREC_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_PUBREL_FLAG_BITS = 0x02;
+        internal const byte MQTT_MSG_PUBCOMP_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_SUBSCRIBE_FLAG_BITS = 0x02;
+        internal const byte MQTT_MSG_SUBACK_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_UNSUBSCRIBE_FLAG_BITS = 0x02;
+        internal const byte MQTT_MSG_UNSUBACK_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_PINGREQ_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_PINGRESP_FLAG_BITS = 0x00;
+        internal const byte MQTT_MSG_DISCONNECT_FLAG_BITS = 0x00;
+
+        // QOS levels
+        public const byte QOS_LEVEL_AT_MOST_ONCE = 0x00;
+        public const byte QOS_LEVEL_AT_LEAST_ONCE = 0x01;
+        public const byte QOS_LEVEL_EXACTLY_ONCE = 0x02;
+
+        // SUBSCRIBE QoS level granted failure [v3.1.1]
+        public const byte QOS_LEVEL_GRANTED_FAILURE = 0x80;
+
+        internal const ushort MAX_TOPIC_LENGTH = 65535;
+        internal const ushort MIN_TOPIC_LENGTH = 1;
+        internal const byte MESSAGE_ID_SIZE = 2;
+
+        #endregion
+
+        #region Properties...
+
+        /// <summary>
+        /// Message type
+        /// </summary>
+        public byte Type
+        {
+            get { return this.type; }
+            set { this.type = value; }
+        }
+
+        /// <summary>
+        /// Duplicate message flag
+        /// </summary>
+        public bool DupFlag
+        {
+            get { return this.dupFlag; }
+            set { this.dupFlag = value; }
+        }
+
+        /// <summary>
+        /// Quality of Service level
+        /// </summary>
+        public byte QosLevel
+        {
+            get { return this.qosLevel; }
+            set { this.qosLevel = value; }
+        }
+
+        /// <summary>
+        /// Retain message flag
+        /// </summary>
+        public bool Retain
+        {
+            get { return this.retain; }
+            set { this.retain = value; }
+        }
+
+        /// <summary>
+        /// Message identifier for the message
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            set { this.messageId = value; }
+        }
+
+        #endregion
+
+        // message type
+        protected byte type;
+        // duplicate delivery
+        protected bool dupFlag;
+        // quality of service level
+        protected byte qosLevel;
+        // retain flag
+        protected bool retain;
+        // message identifier
+        protected ushort messageId;
+
+        /// <summary>
+        /// Returns message bytes rapresentation
+        /// </summary>
+        /// <param name="protocolVersion">Protocol version</param>
+        /// <returns>Bytes rapresentation</returns>
+        public abstract byte[] GetBytes(byte protocolVersion);
+        
+        /// <summary>
+        /// Encode remaining length and insert it into message buffer
+        /// </summary>
+        /// <param name="remainingLength">Remaining length value to encode</param>
+        /// <param name="buffer">Message buffer for inserting encoded value</param>
+        /// <param name="index">Index from which insert encoded value into buffer</param>
+        /// <returns>Index updated</returns>
+        protected int encodeRemainingLength(int remainingLength, byte[] buffer, int index)
+        {
+            int digit = 0;
+            do
+            {
+                digit = remainingLength % 128;
+                remainingLength /= 128;
+                if (remainingLength > 0)
+                    digit = digit | 0x80;
+                buffer[index++] = (byte)digit;
+            } while (remainingLength > 0);
+            return index;
+        }
+
+        /// <summary>
+        /// Decode remaining length reading bytes from socket
+        /// </summary>
+        /// <param name="channel">Channel from reading bytes</param>
+        /// <returns>Decoded remaining length</returns>
+        protected static int decodeRemainingLength(IMqttNetworkChannel channel)
+        {
+            int multiplier = 1;
+            int value = 0;
+            int digit = 0;
+            byte[] nextByte = new byte[1];
+            do
+            {
+                // next digit from stream
+                channel.Receive(nextByte);
+                digit = nextByte[0];
+                value += ((digit & 127) * multiplier);
+                multiplier *= 128;
+            } while ((digit & 128) != 0);
+            return value;
+        }
+
+#if TRACE
+        /// <summary>
+        /// Returns a string representation of the message for tracing
+        /// </summary>
+        /// <param name="name">Message name</param>
+        /// <param name="fieldNames">Message fields name</param>
+        /// <param name="fieldValues">Message fields value</param>
+        /// <returns>String representation of the message</returns>
+        protected string GetTraceString(string name, object[] fieldNames, object[] fieldValues)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(name);
+            
+            if ((fieldNames != null) && (fieldValues != null))
+            {
+                sb.Append("(");
+                bool addComma = false;
+                for (int i = 0; i < fieldValues.Length; i++)
+                {
+                    if (fieldValues[i] != null)
+                    {
+                        if (addComma)
+                        {
+                            sb.Append(",");
+                        }
+
+                        sb.Append(fieldNames[i]);
+                        sb.Append(":");
+                        sb.Append(GetStringObject(fieldValues[i]));
+                        addComma = true;
+                    }
+                }
+                sb.Append(")");
+            }
+            
+            return sb.ToString();
+        }
+
+        object GetStringObject(object value)
+        {
+            byte[] binary = value as byte[];
+            if (binary != null)
+            {
+                string hexChars = "0123456789ABCDEF";
+                StringBuilder sb = new StringBuilder(binary.Length * 2);
+                for (int i = 0; i < binary.Length; ++i)
+                {
+                    sb.Append(hexChars[binary[i] >> 4]);
+                    sb.Append(hexChars[binary[i] & 0x0F]);
+                }
+
+                return sb.ToString();
+            }
+
+            object[] list = value as object[];
+            if (list != null)
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append('[');
+                for (int i = 0; i < list.Length; ++i)
+                {
+                    if (i > 0) sb.Append(',');
+                    sb.Append(list[i]);
+                }
+                sb.Append(']');
+
+                return sb.ToString();
+            }
+
+            return value;
+        }
+#endif
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnack.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnack.cs
new file mode 100644
index 0000000..ae5a342
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnack.cs
@@ -0,0 +1,191 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for CONNACK message from broker to client
+    /// </summary>
+    public class MqttMsgConnack : MqttMsgBase
+    {
+        #region Constants...
+
+        // return codes for CONNACK message
+        public const byte CONN_ACCEPTED = 0x00;
+        public const byte CONN_REFUSED_PROT_VERS = 0x01;
+        public const byte CONN_REFUSED_IDENT_REJECTED = 0x02;
+        public const byte CONN_REFUSED_SERVER_UNAVAILABLE = 0x03;
+        public const byte CONN_REFUSED_USERNAME_PASSWORD = 0x04;
+        public const byte CONN_REFUSED_NOT_AUTHORIZED = 0x05;
+
+        private const byte TOPIC_NAME_COMP_RESP_BYTE_OFFSET = 0;
+        private const byte TOPIC_NAME_COMP_RESP_BYTE_SIZE = 1;
+        // [v3.1.1] connect acknowledge flags replace "old" topic name compression respone (not used in 3.1)
+        private const byte CONN_ACK_FLAGS_BYTE_OFFSET = 0;
+        private const byte CONN_ACK_FLAGS_BYTE_SIZE = 1;
+        // [v3.1.1] session present flag
+        private const byte SESSION_PRESENT_FLAG_MASK = 0x01;
+        private const byte SESSION_PRESENT_FLAG_OFFSET = 0x00;
+        private const byte SESSION_PRESENT_FLAG_SIZE = 0x01;
+        private const byte CONN_RETURN_CODE_BYTE_OFFSET = 1;
+        private const byte CONN_RETURN_CODE_BYTE_SIZE = 1;
+
+        #endregion
+
+        #region Properties...
+
+        // [v3.1.1] session present flag
+        /// <summary>
+        /// Session present flag
+        /// </summary>
+        public bool SessionPresent
+        {
+            get { return this.sessionPresent; }
+            set { this.sessionPresent = value; }
+        }
+
+        /// <summary>
+        /// Return Code
+        /// </summary>
+        public byte ReturnCode
+        {
+            get { return this.returnCode; }
+            set { this.returnCode = value; }
+        }
+
+        #endregion
+
+        // [v3.1.1] session present flag
+        private bool sessionPresent;
+
+        // return code for CONNACK message
+        private byte returnCode;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgConnack()
+        {
+            this.type = MQTT_MSG_CONNACK_TYPE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a CONNACK message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>CONNACK message instance</returns>
+        public static MqttMsgConnack Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            MqttMsgConnack msg = new MqttMsgConnack();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_CONNACK_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] ... set session present flag ...
+                msg.sessionPresent = (buffer[CONN_ACK_FLAGS_BYTE_OFFSET] & SESSION_PRESENT_FLAG_MASK) != 0x00;
+            }
+            // ...and set return code from broker
+            msg.returnCode = buffer[CONN_RETURN_CODE_BYTE_OFFSET];
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte ProtocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            if (ProtocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                // flags byte and connect return code
+                varHeaderSize += (CONN_ACK_FLAGS_BYTE_SIZE + CONN_RETURN_CODE_BYTE_SIZE);
+            else
+                // topic name compression response and connect return code
+                varHeaderSize += (TOPIC_NAME_COMP_RESP_BYTE_SIZE + CONN_RETURN_CODE_BYTE_SIZE);
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (ProtocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_CONNACK_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_CONNACK_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (byte)(MQTT_MSG_CONNACK_TYPE << MSG_TYPE_OFFSET);
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            if (ProtocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                // [v3.1.1] session present flag
+                buffer[index++] = this.sessionPresent ? (byte)(1 << SESSION_PRESENT_FLAG_OFFSET) : (byte)0x00;
+            else
+                // topic name compression response (reserved values. not used);
+                buffer[index++] = 0x00;
+            
+            // connect return code
+            buffer[index++] = this.returnCode;
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "CONNACK",
+                new object[] { "returnCode" },
+                new object[] { this.returnCode });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnect.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnect.cs
new file mode 100644
index 0000000..382cf83
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnect.cs
@@ -0,0 +1,582 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Text;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for CONNECT message from client to broker
+    /// </summary>
+    public class MqttMsgConnect : MqttMsgBase
+    {
+        #region Constants...
+
+        // protocol name supported
+        internal const string PROTOCOL_NAME_V3_1 = "MQIsdp";
+        internal const string PROTOCOL_NAME_V3_1_1 = "MQTT"; // [v.3.1.1]
+        
+        // max length for client id (removed in 3.1.1)
+        internal const int CLIENT_ID_MAX_LENGTH = 23;
+
+        // variable header fields
+        internal const byte PROTOCOL_NAME_LEN_SIZE = 2;
+        internal const byte PROTOCOL_NAME_V3_1_SIZE = 6;
+        internal const byte PROTOCOL_NAME_V3_1_1_SIZE = 4; // [v.3.1.1]
+        internal const byte PROTOCOL_VERSION_SIZE = 1;
+        internal const byte CONNECT_FLAGS_SIZE = 1;
+        internal const byte KEEP_ALIVE_TIME_SIZE = 2;
+
+        internal const byte PROTOCOL_VERSION_V3_1 = 0x03;
+        internal const byte PROTOCOL_VERSION_V3_1_1 = 0x04; // [v.3.1.1]
+        internal const ushort KEEP_ALIVE_PERIOD_DEFAULT = 60; // seconds
+        internal const ushort MAX_KEEP_ALIVE = 65535; // 16 bit
+
+        // connect flags
+        internal const byte USERNAME_FLAG_MASK = 0x80;
+        internal const byte USERNAME_FLAG_OFFSET = 0x07;
+        internal const byte USERNAME_FLAG_SIZE = 0x01;
+        internal const byte PASSWORD_FLAG_MASK = 0x40;
+        internal const byte PASSWORD_FLAG_OFFSET = 0x06;
+        internal const byte PASSWORD_FLAG_SIZE = 0x01;
+        internal const byte WILL_RETAIN_FLAG_MASK = 0x20;
+        internal const byte WILL_RETAIN_FLAG_OFFSET = 0x05;
+        internal const byte WILL_RETAIN_FLAG_SIZE = 0x01;
+        internal const byte WILL_QOS_FLAG_MASK = 0x18;
+        internal const byte WILL_QOS_FLAG_OFFSET = 0x03;
+        internal const byte WILL_QOS_FLAG_SIZE = 0x02;
+        internal const byte WILL_FLAG_MASK = 0x04;
+        internal const byte WILL_FLAG_OFFSET = 0x02;
+        internal const byte WILL_FLAG_SIZE = 0x01;
+        internal const byte CLEAN_SESSION_FLAG_MASK = 0x02;
+        internal const byte CLEAN_SESSION_FLAG_OFFSET = 0x01;
+        internal const byte CLEAN_SESSION_FLAG_SIZE = 0x01;
+        // [v.3.1.1] lsb (reserved) must be now 0
+        internal const byte RESERVED_FLAG_MASK = 0x01;
+        internal const byte RESERVED_FLAG_OFFSET = 0x00;
+        internal const byte RESERVED_FLAG_SIZE = 0x01;
+
+        #endregion
+
+        #region Properties...
+
+        /// <summary>
+        /// Protocol name
+        /// </summary>
+        public string ProtocolName
+        {
+            get { return this.protocolName; }
+            set { this.protocolName = value; }
+        }
+
+        /// <summary>
+        /// Protocol version
+        /// </summary>
+        public byte ProtocolVersion
+        {
+            get { return this.protocolVersion; }
+            set { this.protocolVersion = value; }
+        }
+
+        /// <summary>
+        /// Client identifier
+        /// </summary>
+        public string ClientId
+        {
+            get { return this.clientId; }
+            set { this.clientId = value; }
+        }
+
+        /// <summary>
+        /// Will retain flag
+        /// </summary>
+        public bool WillRetain
+        {
+            get { return this.willRetain; }
+            set { this.willRetain = value; }
+        }
+
+        /// <summary>
+        /// Will QOS level
+        /// </summary>
+        public byte WillQosLevel
+        {
+            get { return this.willQosLevel; }
+            set { this.willQosLevel = value; }
+        }
+
+        /// <summary>
+        /// Will flag
+        /// </summary>
+        public bool WillFlag
+        {
+            get { return this.willFlag; }
+            set { this.willFlag = value; }
+        }
+
+        /// <summary>
+        /// Will topic
+        /// </summary>
+        public string WillTopic
+        {
+            get { return this.willTopic; }
+            set { this.willTopic = value; }
+        }
+
+        /// <summary>
+        /// Will message
+        /// </summary>
+        public string WillMessage
+        {
+            get { return this.willMessage; }
+            set { this.willMessage = value; }
+        }
+
+        /// <summary>
+        /// Username
+        /// </summary>
+        public string Username
+        {
+            get { return this.username; }
+            set { this.username = value; }
+        }
+
+        /// <summary>
+        /// Password
+        /// </summary>
+        public string Password
+        {
+            get { return this.password; }
+            set { this.password = value; }
+        }
+
+        /// <summary>
+        /// Clean session flag
+        /// </summary>
+        public bool CleanSession
+        {
+            get { return this.cleanSession; }
+            set { this.cleanSession = value; }
+        }
+
+        /// <summary>
+        /// Keep alive period
+        /// </summary>
+        public ushort KeepAlivePeriod
+        {
+            get { return this.keepAlivePeriod; }
+            set { this.keepAlivePeriod = value; }
+        }
+
+        #endregion
+
+        // protocol name
+        private string protocolName;
+        // protocol version
+        private byte protocolVersion;
+        // client identifier
+        private string clientId;
+        // will retain flag
+        protected bool willRetain;
+        // will quality of service level
+        protected byte willQosLevel;
+        // will flag
+        private bool willFlag;
+        // will topic
+        private string willTopic;
+        // will message
+        private string willMessage;
+        // username
+        private string username;
+        // password
+        private string password;
+        // clean session flag
+        private bool cleanSession;
+        // keep alive period (in sec)
+        private ushort keepAlivePeriod;
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgConnect()
+        {
+            this.type = MQTT_MSG_CONNECT_TYPE;
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        public MqttMsgConnect(string clientId) :
+            this(clientId, null, null, false, QOS_LEVEL_AT_LEAST_ONCE, false, null, null, true, KEEP_ALIVE_PERIOD_DEFAULT, PROTOCOL_VERSION_V3_1_1)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        /// <param name="username">Username</param>
+        /// <param name="password">Password</param>
+        /// <param name="willRetain">Will retain flag</param>
+        /// <param name="willQosLevel">Will QOS level</param>
+        /// <param name="willFlag">Will flag</param>
+        /// <param name="willTopic">Will topic</param>
+        /// <param name="willMessage">Will message</param>
+        /// <param name="cleanSession">Clean sessione flag</param>
+        /// <param name="keepAlivePeriod">Keep alive period</param>
+        /// <param name="protocolVersion">Protocol version</param>
+        public MqttMsgConnect(string clientId, 
+            string username, 
+            string password,
+            bool willRetain,
+            byte willQosLevel,
+            bool willFlag,
+            string willTopic,
+            string willMessage,
+            bool cleanSession,
+            ushort keepAlivePeriod,
+            byte protocolVersion
+            )
+        {
+            this.type = MQTT_MSG_CONNECT_TYPE;
+
+            this.clientId = clientId;
+            this.username = username;
+            this.password = password;
+            this.willRetain = willRetain;
+            this.willQosLevel = willQosLevel;
+            this.willFlag = willFlag;
+            this.willTopic = willTopic;
+            this.willMessage = willMessage;
+            this.cleanSession = cleanSession;
+            this.keepAlivePeriod = keepAlivePeriod;
+            // [v.3.1.1] added new protocol name and version
+            this.protocolVersion = protocolVersion;
+            this.protocolName = (this.protocolVersion == PROTOCOL_VERSION_V3_1_1) ? PROTOCOL_NAME_V3_1_1 : PROTOCOL_NAME_V3_1;
+        }
+
+        /// <summary>
+        /// Parse bytes for a CONNECT message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>CONNECT message instance</returns>
+        public static MqttMsgConnect Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            int protNameUtf8Length;
+            byte[] protNameUtf8;
+            bool isUsernameFlag;
+            bool isPasswordFlag;
+            int clientIdUtf8Length;
+            byte[] clientIdUtf8;
+            int willTopicUtf8Length;
+            byte[] willTopicUtf8;
+            int willMessageUtf8Length;
+            byte[] willMessageUtf8;
+            int usernameUtf8Length;
+            byte[] usernameUtf8;
+            int passwordUtf8Length;
+            byte[] passwordUtf8;
+            MqttMsgConnect msg = new MqttMsgConnect();
+            
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // protocol name
+            protNameUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+            protNameUtf8Length |= buffer[index++];
+            protNameUtf8 = new byte[protNameUtf8Length];
+            Array.Copy(buffer, index, protNameUtf8, 0, protNameUtf8Length);
+            index += protNameUtf8Length;
+            msg.protocolName = new String(Encoding.UTF8.GetChars(protNameUtf8));
+
+            // [v3.1.1] wrong protocol name
+            if (!msg.protocolName.Equals(PROTOCOL_NAME_V3_1) && !msg.protocolName.Equals(PROTOCOL_NAME_V3_1_1))
+                throw new MqttClientException(MqttClientErrorCode.InvalidProtocolName);
+
+            // protocol version
+            msg.protocolVersion = buffer[index];
+            index += PROTOCOL_VERSION_SIZE;
+
+            // connect flags
+            // [v3.1.1] check lsb (reserved) must be 0
+            if ((msg.protocolVersion == PROTOCOL_VERSION_V3_1_1) &&
+                ((buffer[index] & RESERVED_FLAG_MASK) != 0x00))
+                throw new MqttClientException(MqttClientErrorCode.InvalidConnectFlags);
+
+            isUsernameFlag = (buffer[index] & USERNAME_FLAG_MASK) != 0x00;
+            isPasswordFlag = (buffer[index] & PASSWORD_FLAG_MASK) != 0x00;
+            msg.willRetain = (buffer[index] & WILL_RETAIN_FLAG_MASK) != 0x00;
+            msg.willQosLevel = (byte)((buffer[index] & WILL_QOS_FLAG_MASK) >> WILL_QOS_FLAG_OFFSET);
+            msg.willFlag = (buffer[index] & WILL_FLAG_MASK) != 0x00;
+            msg.cleanSession = (buffer[index] & CLEAN_SESSION_FLAG_MASK) != 0x00;
+            index += CONNECT_FLAGS_SIZE;
+
+            // keep alive timer
+            msg.keepAlivePeriod = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.keepAlivePeriod |= buffer[index++];
+
+            // client identifier [v3.1.1] it may be zero bytes long (empty string)
+            clientIdUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+            clientIdUtf8Length |= buffer[index++];
+            clientIdUtf8 = new byte[clientIdUtf8Length];
+            Array.Copy(buffer, index, clientIdUtf8, 0, clientIdUtf8Length);
+            index += clientIdUtf8Length;
+            msg.clientId = new String(Encoding.UTF8.GetChars(clientIdUtf8));
+            // [v3.1.1] if client identifier is zero bytes long, clean session must be true
+            if ((msg.protocolVersion == PROTOCOL_VERSION_V3_1_1) && (clientIdUtf8Length == 0) && (!msg.cleanSession))
+                throw new MqttClientException(MqttClientErrorCode.InvalidClientId);
+
+            // will topic and will message
+            if (msg.willFlag)
+            {
+                willTopicUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                willTopicUtf8Length |= buffer[index++];
+                willTopicUtf8 = new byte[willTopicUtf8Length];
+                Array.Copy(buffer, index, willTopicUtf8, 0, willTopicUtf8Length);
+                index += willTopicUtf8Length;
+                msg.willTopic = new String(Encoding.UTF8.GetChars(willTopicUtf8));
+
+                willMessageUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                willMessageUtf8Length |= buffer[index++];
+                willMessageUtf8 = new byte[willMessageUtf8Length];
+                Array.Copy(buffer, index, willMessageUtf8, 0, willMessageUtf8Length);
+                index += willMessageUtf8Length;
+                msg.willMessage = new String(Encoding.UTF8.GetChars(willMessageUtf8));
+            }
+
+            // username
+            if (isUsernameFlag)
+            {
+                usernameUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                usernameUtf8Length |= buffer[index++];
+                usernameUtf8 = new byte[usernameUtf8Length];
+                Array.Copy(buffer, index, usernameUtf8, 0, usernameUtf8Length);
+                index += usernameUtf8Length;
+                msg.username = new String(Encoding.UTF8.GetChars(usernameUtf8));
+            }
+
+            // password
+            if (isPasswordFlag)
+            {
+                passwordUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                passwordUtf8Length |= buffer[index++];
+                passwordUtf8 = new byte[passwordUtf8Length];
+                Array.Copy(buffer, index, passwordUtf8, 0, passwordUtf8Length);
+                index += passwordUtf8Length;
+                msg.password = new String(Encoding.UTF8.GetChars(passwordUtf8));
+            }
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            byte[] clientIdUtf8 = Encoding.UTF8.GetBytes(this.clientId);
+            byte[] willTopicUtf8 = (this.willFlag && (this.willTopic != null)) ? Encoding.UTF8.GetBytes(this.willTopic) : null;
+            byte[] willMessageUtf8 = (this.willFlag && (this.willMessage != null)) ? Encoding.UTF8.GetBytes(this.willMessage) : null;
+            byte[] usernameUtf8 = ((this.username != null) && (this.username.Length > 0)) ? Encoding.UTF8.GetBytes(this.username) : null;
+            byte[] passwordUtf8 = ((this.password != null) && (this.password.Length > 0)) ? Encoding.UTF8.GetBytes(this.password) : null;
+
+            // [v3.1.1]
+            if (this.protocolVersion == PROTOCOL_VERSION_V3_1_1)
+            {
+                // will flag set, will topic and will message MUST be present
+                if (this.willFlag &&  ((this.willQosLevel >= 0x03) ||
+                                       (willTopicUtf8 == null) || (willMessageUtf8 == null) ||
+                                       ((willTopicUtf8 != null) && (willTopicUtf8.Length == 0)) || 
+                                       ((willMessageUtf8 != null) && (willMessageUtf8.Length == 0))))
+                    throw new MqttClientException(MqttClientErrorCode.WillWrong);
+                // willflag not set, retain must be 0 and will topic and message MUST NOT be present
+                else if (!this.willFlag && ((this.willRetain) ||
+                                            (willTopicUtf8 != null) || (willMessageUtf8 != null) ||
+                                            ((willTopicUtf8 != null) && (willTopicUtf8.Length != 0)) || 
+                                            ((willMessageUtf8 != null) && (willMessageUtf8.Length != 0))))
+                    throw new MqttClientException(MqttClientErrorCode.WillWrong);
+            }
+
+            if (this.keepAlivePeriod > MAX_KEEP_ALIVE)
+                throw new MqttClientException(MqttClientErrorCode.KeepAliveWrong);
+
+            // check on will QoS Level
+            if ((this.willQosLevel < MqttMsgBase.QOS_LEVEL_AT_MOST_ONCE) ||
+                (this.willQosLevel > MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE))
+                throw new MqttClientException(MqttClientErrorCode.WillWrong);
+
+            // protocol name field size
+            // MQTT version 3.1
+            if (this.protocolVersion == PROTOCOL_VERSION_V3_1)
+            {
+                varHeaderSize += (PROTOCOL_NAME_LEN_SIZE + PROTOCOL_NAME_V3_1_SIZE);
+            }
+            // MQTT version 3.1.1
+            else
+            {
+                varHeaderSize += (PROTOCOL_NAME_LEN_SIZE + PROTOCOL_NAME_V3_1_1_SIZE);
+            }
+            // protocol level field size
+            varHeaderSize += PROTOCOL_VERSION_SIZE;
+            // connect flags field size
+            varHeaderSize += CONNECT_FLAGS_SIZE;
+            // keep alive timer field size
+            varHeaderSize += KEEP_ALIVE_TIME_SIZE;
+
+            // client identifier field size
+            payloadSize += clientIdUtf8.Length + 2;
+            // will topic field size
+            payloadSize += (willTopicUtf8 != null) ? (willTopicUtf8.Length + 2) : 0;
+            // will message field size
+            payloadSize += (willMessageUtf8 != null) ? (willMessageUtf8.Length + 2) : 0;
+            // username field size
+            payloadSize += (usernameUtf8 != null) ? (usernameUtf8.Length + 2) : 0;
+            // password field size
+            payloadSize += (passwordUtf8 != null) ? (passwordUtf8.Length + 2) : 0;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            buffer[index++] = (MQTT_MSG_CONNECT_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_CONNECT_FLAG_BITS; // [v.3.1.1]
+
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // protocol name
+            buffer[index++] = 0; // MSB protocol name size
+            // MQTT version 3.1
+            if (this.protocolVersion == PROTOCOL_VERSION_V3_1)
+            {
+                buffer[index++] = PROTOCOL_NAME_V3_1_SIZE; // LSB protocol name size
+                Array.Copy(Encoding.UTF8.GetBytes(PROTOCOL_NAME_V3_1), 0, buffer, index, PROTOCOL_NAME_V3_1_SIZE);
+                index += PROTOCOL_NAME_V3_1_SIZE;
+                // protocol version
+                buffer[index++] = PROTOCOL_VERSION_V3_1;
+            }
+            // MQTT version 3.1.1
+            else
+            {
+                buffer[index++] = PROTOCOL_NAME_V3_1_1_SIZE; // LSB protocol name size
+                Array.Copy(Encoding.UTF8.GetBytes(PROTOCOL_NAME_V3_1_1), 0, buffer, index, PROTOCOL_NAME_V3_1_1_SIZE);
+                index += PROTOCOL_NAME_V3_1_1_SIZE;
+                // protocol version
+                buffer[index++] = PROTOCOL_VERSION_V3_1_1;
+            }
+            
+            // connect flags
+            byte connectFlags = 0x00;
+            connectFlags |= (usernameUtf8 != null) ? (byte)(1 << USERNAME_FLAG_OFFSET) : (byte)0x00;
+            connectFlags |= (passwordUtf8 != null) ? (byte)(1 << PASSWORD_FLAG_OFFSET) : (byte)0x00;
+            connectFlags |= (this.willRetain) ? (byte)(1 << WILL_RETAIN_FLAG_OFFSET) : (byte)0x00;
+            // only if will flag is set, we have to use will QoS level (otherwise is MUST be 0)
+            if (this.willFlag)
+                connectFlags |= (byte)(this.willQosLevel << WILL_QOS_FLAG_OFFSET);
+            connectFlags |= (this.willFlag) ? (byte)(1 << WILL_FLAG_OFFSET) : (byte)0x00;
+            connectFlags |= (this.cleanSession) ? (byte)(1 << CLEAN_SESSION_FLAG_OFFSET) : (byte)0x00;
+            buffer[index++] = connectFlags;
+
+            // keep alive period
+            buffer[index++] = (byte)((this.keepAlivePeriod >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.keepAlivePeriod & 0x00FF); // LSB
+
+            // client identifier
+            buffer[index++] = (byte)((clientIdUtf8.Length >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(clientIdUtf8.Length & 0x00FF); // LSB
+            Array.Copy(clientIdUtf8, 0, buffer, index, clientIdUtf8.Length);
+            index += clientIdUtf8.Length;
+
+            // will topic
+            if (this.willFlag && (willTopicUtf8 != null))
+            {
+                buffer[index++] = (byte)((willTopicUtf8.Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(willTopicUtf8.Length & 0x00FF); // LSB
+                Array.Copy(willTopicUtf8, 0, buffer, index, willTopicUtf8.Length);
+                index += willTopicUtf8.Length;
+            }
+
+            // will message
+            if (this.willFlag && (willMessageUtf8 != null))
+            {
+                buffer[index++] = (byte)((willMessageUtf8.Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(willMessageUtf8.Length & 0x00FF); // LSB
+                Array.Copy(willMessageUtf8, 0, buffer, index, willMessageUtf8.Length);
+                index += willMessageUtf8.Length;
+            }
+
+            // username
+            if (usernameUtf8 != null)
+            {
+                buffer[index++] = (byte)((usernameUtf8.Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(usernameUtf8.Length & 0x00FF); // LSB
+                Array.Copy(usernameUtf8, 0, buffer, index, usernameUtf8.Length);
+                index += usernameUtf8.Length;
+            }
+
+            // password
+            if (passwordUtf8 != null)
+            {
+                buffer[index++] = (byte)((passwordUtf8.Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(passwordUtf8.Length & 0x00FF); // LSB
+                Array.Copy(passwordUtf8, 0, buffer, index, passwordUtf8.Length);
+                index += passwordUtf8.Length;
+            }
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "CONNECT",
+                new object[] { "protocolName", "protocolVersion", "clientId", "willFlag", "willRetain", "willQosLevel", "willTopic", "willMessage", "username", "password", "cleanSession", "keepAlivePeriod" },
+                new object[] { this.protocolName, this.protocolVersion, this.clientId, this.willFlag, this.willRetain, this.willQosLevel, this.willTopic, this.willMessage, this.username, this.password, this.cleanSession, this.keepAlivePeriod });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnectEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnectEventArgs.cs
new file mode 100644
index 0000000..ce0b3fe
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgConnectEventArgs.cs
@@ -0,0 +1,44 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for CONNECT message received from client
+    /// </summary>
+    public class MqttMsgConnectEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Message received from client
+        /// </summary>
+        public MqttMsgConnect Message { get; private set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="msg">CONNECT message received from client</param>
+        public MqttMsgConnectEventArgs(MqttMsgConnect connect)
+        {
+            this.Message = connect;
+        }
+    }
+} 
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgContext.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgContext.cs
new file mode 100644
index 0000000..a2850d7
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgContext.cs
@@ -0,0 +1,159 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Text;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Context for MQTT message
+    /// </summary>
+    public class MqttMsgContext
+    {
+        /// <summary>
+        /// MQTT message
+        /// </summary>
+        public MqttMsgBase Message { get; set; }
+
+        /// <summary>
+        /// MQTT message state
+        /// </summary>
+        public MqttMsgState State { get; set; }
+
+        /// <summary>
+        /// Flow of the message
+        /// </summary>
+        public MqttMsgFlow Flow { get; set; }
+
+        /// <summary>
+        /// Timestamp in ticks (for retry)
+        /// </summary>
+        public int Timestamp { get; set; }
+
+        /// <summary>
+        /// Attempt (for retry)
+        /// </summary>
+        public int Attempt { get; set; }
+
+        /// <summary>
+        /// Unique key
+        /// </summary>
+        public string Key 
+        {
+            get { return this.Flow + "_" + this.Message.MessageId; }
+        }
+    }
+
+    /// <summary>
+    /// Flow of the message
+    /// </summary>
+    public enum MqttMsgFlow
+    {
+        /// <summary>
+        /// To publish to subscribers
+        /// </summary>
+        ToPublish,
+
+        /// <summary>
+        /// To acknowledge to publisher
+        /// </summary>
+        ToAcknowledge
+    }
+
+    /// <summary>
+    /// MQTT message state
+    /// </summary>
+    public enum MqttMsgState
+    {
+        /// <summary>
+        /// QOS = 0, Message queued
+        /// </summary>
+        QueuedQos0,
+
+        /// <summary>
+        /// QOS = 1, Message queued
+        /// </summary>
+        QueuedQos1,
+
+        /// <summary>
+        /// QOS = 2, Message queued
+        /// </summary>
+        QueuedQos2,
+
+        /// <summary>
+        /// QOS = 1, PUBLISH sent, wait for PUBACK
+        /// </summary>
+        WaitForPuback,
+
+        /// <summary>
+        /// QOS = 2, PUBLISH sent, wait for PUBREC
+        /// </summary>
+        WaitForPubrec,
+
+        /// <summary>
+        /// QOS = 2, PUBREC sent, wait for PUBREL
+        /// </summary>
+        WaitForPubrel,
+
+        /// <summary>
+        /// QOS = 2, PUBREL sent, wait for PUBCOMP
+        /// </summary>
+        WaitForPubcomp,
+
+        /// <summary>
+        /// QOS = 2, start first phase handshake send PUBREC
+        /// </summary>
+        SendPubrec,
+        
+        /// <summary>
+        /// QOS = 2, start second phase handshake send PUBREL
+        /// </summary>
+        SendPubrel,
+
+        /// <summary>
+        /// QOS = 2, end second phase handshake send PUBCOMP
+        /// </summary>
+        SendPubcomp,
+
+        /// <summary>
+        /// QOS = 1, PUBLISH received, send PUBACK
+        /// </summary>
+        SendPuback,
+
+        // [v3.1.1] SUBSCRIBE isn't "officially" QOS = 1
+        /// <summary>
+        /// Send SUBSCRIBE message
+        /// </summary>
+        SendSubscribe,
+
+        // [v3.1.1] UNSUBSCRIBE isn't "officially" QOS = 1
+        /// <summary>
+        /// Send UNSUBSCRIBE message
+        /// </summary>
+        SendUnsubscribe,
+
+        /// <summary>
+        /// (QOS = 1), SUBSCRIBE sent, wait for SUBACK
+        /// </summary>
+        WaitForSuback,
+
+        /// <summary>
+        /// (QOS = 1), UNSUBSCRIBE sent, wait for UNSUBACK
+        /// </summary>
+        WaitForUnsuback
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgDisconnect.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgDisconnect.cs
new file mode 100644
index 0000000..d918473
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgDisconnect.cs
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for DISCONNECT message from client to broker
+    /// </summary>
+    public class MqttMsgDisconnect : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgDisconnect()
+        {
+            this.type = MQTT_MSG_DISCONNECT_TYPE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a DISCONNECT message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>DISCONNECT message instance</returns>
+        public static MqttMsgDisconnect Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            MqttMsgDisconnect msg = new MqttMsgDisconnect();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_DISCONNECT_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            // NOTE : remainingLength must be 0
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            byte[] buffer = new byte[2];
+            int index = 0;
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_DISCONNECT_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_DISCONNECT_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_DISCONNECT_TYPE << MSG_TYPE_OFFSET);
+            buffer[index++] = 0x00;
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "DISCONNECT",
+                null,
+                null);
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingReq.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingReq.cs
new file mode 100644
index 0000000..b46bdb6
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingReq.cs
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PINGREQ message from client to broker
+    /// </summary>
+    public class MqttMsgPingReq : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPingReq()
+        {
+            this.type = MQTT_MSG_PINGREQ_TYPE;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            byte[] buffer = new byte[2];
+            int index = 0;
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PINGREQ_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PINGREQ_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_PINGREQ_TYPE << MSG_TYPE_OFFSET);
+            buffer[index++] = 0x00;
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PINGREQ message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PINGREQ message instance</returns>
+        public static MqttMsgPingReq Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            MqttMsgPingReq msg = new MqttMsgPingReq();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PINGREQ_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // already know remaininglength is zero (MQTT specification),
+            // so it isn't necessary to read other data from socket
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PINGREQ",
+                null,
+                null);
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingResp.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingResp.cs
new file mode 100644
index 0000000..2b028b9
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPingResp.cs
@@ -0,0 +1,87 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PINGRESP message from client to broker
+    /// </summary>
+    public class MqttMsgPingResp : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPingResp()
+        {
+            this.type = MQTT_MSG_PINGRESP_TYPE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PINGRESP message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PINGRESP message instance</returns>
+        public static MqttMsgPingResp Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            MqttMsgPingResp msg = new MqttMsgPingResp();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PINGRESP_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // already know remaininglength is zero (MQTT specification),
+            // so it isn't necessary to read other data from socket
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            byte[] buffer = new byte[2];
+            int index = 0;
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PINGRESP_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PINGRESP_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_PINGRESP_TYPE << MSG_TYPE_OFFSET);
+            buffer[index++] = 0x00;
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PINGRESP",
+                null,
+                null);
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPuback.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPuback.cs
new file mode 100644
index 0000000..e00e37f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPuback.cs
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PUBACK message from broker to client
+    /// </summary>
+    public class MqttMsgPuback : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPuback()
+        {
+            this.type = MQTT_MSG_PUBACK_TYPE;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PUBACK_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PUBACK_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_PUBACK_TYPE << MSG_TYPE_OFFSET);
+                              
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // get message identifier
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB 
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PUBACK message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PUBACK message instance</returns>
+        public static MqttMsgPuback Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgPuback msg = new MqttMsgPuback();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PUBACK_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PUBACK",
+                new object[] { "messageId" },
+                new object[] { this.messageId });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubcomp.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubcomp.cs
new file mode 100644
index 0000000..eeabd3b
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubcomp.cs
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PUBCOMP message from broker to client
+    /// </summary>
+    public class MqttMsgPubcomp : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPubcomp()
+        {
+            this.type = MQTT_MSG_PUBCOMP_TYPE;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PUBCOMP_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PUBCOMP_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_PUBCOMP_TYPE << MSG_TYPE_OFFSET);
+
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // get message identifier
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB 
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PUBCOMP message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PUBCOMP message instance</returns>
+        public static MqttMsgPubcomp Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgPubcomp msg = new MqttMsgPubcomp();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PUBCOMP_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PUBCOMP",
+                new object[] { "messageId" },
+                new object[] { this.messageId });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublish.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublish.cs
new file mode 100644
index 0000000..6bbf207
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublish.cs
@@ -0,0 +1,277 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Text;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PUBLISH message from client to broker
+    /// </summary>
+    public class MqttMsgPublish : MqttMsgBase
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message topic
+        /// </summary>
+        public string Topic
+        {
+            get { return this.topic; }
+            set { this.topic = value; }
+        }
+
+        /// <summary>
+        /// Message data
+        /// </summary>
+        public byte[] Message
+        {
+            get { return this.message; }
+            set { this.message = value; }
+        }
+
+        #endregion
+
+        // message topic
+        private string topic;
+        // message data
+        private byte[] message;
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPublish()
+        {
+            this.type = MQTT_MSG_PUBLISH_TYPE;
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="topic">Message topic</param>
+        /// <param name="message">Message data</param>
+        public MqttMsgPublish(string topic, byte[] message) :
+            this(topic, message, false, QOS_LEVEL_AT_MOST_ONCE, false)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="topic">Message topic</param>
+        /// <param name="message">Message data</param>
+        /// <param name="dupFlag">Duplicate flag</param>
+        /// <param name="qosLevel">Quality of Service level</param>
+        /// <param name="retain">Retain flag</param>
+        public MqttMsgPublish(string topic,
+            byte[] message,
+            bool dupFlag,
+            byte qosLevel,
+            bool retain) : base()
+        {
+            this.type = MQTT_MSG_PUBLISH_TYPE;
+
+            this.topic = topic;
+            this.message = message;
+            this.dupFlag = dupFlag;
+            this.qosLevel = qosLevel;
+            this.retain = retain;
+            this.messageId = 0;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // topic can't contain wildcards
+            if ((this.topic.IndexOf('#') != -1) || (this.topic.IndexOf('+') != -1))
+                throw new MqttClientException(MqttClientErrorCode.TopicWildcard);
+
+            // check topic length
+            if ((this.topic.Length < MIN_TOPIC_LENGTH) || (this.topic.Length > MAX_TOPIC_LENGTH))
+                throw new MqttClientException(MqttClientErrorCode.TopicLength);
+
+            // check wrong QoS level (both bits can't be set 1)
+            if (this.qosLevel > QOS_LEVEL_EXACTLY_ONCE)
+                throw new MqttClientException(MqttClientErrorCode.QosNotAllowed);
+
+            byte[] topicUtf8 = Encoding.UTF8.GetBytes(this.topic);
+
+            // topic name
+            varHeaderSize += topicUtf8.Length + 2;
+
+            // message id is valid only with QOS level 1 or QOS level 2
+            if ((this.qosLevel == QOS_LEVEL_AT_LEAST_ONCE) || 
+                (this.qosLevel == QOS_LEVEL_EXACTLY_ONCE))
+            {
+                varHeaderSize += MESSAGE_ID_SIZE;
+            }
+            
+            // check on message with zero length
+            if (this.message != null)
+                // message data
+                payloadSize += this.message.Length;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            buffer[index] = (byte)((MQTT_MSG_PUBLISH_TYPE << MSG_TYPE_OFFSET) |
+                                   (this.qosLevel << QOS_LEVEL_OFFSET));
+            buffer[index] |= this.dupFlag ? (byte)(1 << DUP_FLAG_OFFSET) : (byte)0x00;
+            buffer[index] |= this.retain ? (byte)(1 << RETAIN_FLAG_OFFSET) : (byte)0x00;
+            index++;
+
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // topic name
+            buffer[index++] = (byte)((topicUtf8.Length >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(topicUtf8.Length & 0x00FF); // LSB
+            Array.Copy(topicUtf8, 0, buffer, index, topicUtf8.Length);
+            index += topicUtf8.Length;
+
+            // message id is valid only with QOS level 1 or QOS level 2
+            if ((this.qosLevel == QOS_LEVEL_AT_LEAST_ONCE) ||
+                (this.qosLevel == QOS_LEVEL_EXACTLY_ONCE))
+            {
+                // check message identifier assigned
+                if (this.messageId == 0)
+                    throw new MqttClientException(MqttClientErrorCode.WrongMessageId);
+                buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB
+            }
+
+            // check on message with zero length
+            if (this.message != null)
+            {
+                // message data
+                Array.Copy(this.message, 0, buffer, index, this.message.Length);
+                index += this.message.Length;
+            }
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PUBLISH message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PUBLISH message instance</returns>
+        public static MqttMsgPublish Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            byte[] topicUtf8;
+            int topicUtf8Length;
+            MqttMsgPublish msg = new MqttMsgPublish();
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            int received = channel.Receive(buffer);
+
+            // topic name
+            topicUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+            topicUtf8Length |= buffer[index++];
+            topicUtf8 = new byte[topicUtf8Length];
+            Array.Copy(buffer, index, topicUtf8, 0, topicUtf8Length);
+            index += topicUtf8Length;
+            msg.topic = new String(Encoding.UTF8.GetChars(topicUtf8));
+
+            // read QoS level from fixed header
+            msg.qosLevel = (byte)((fixedHeaderFirstByte & QOS_LEVEL_MASK) >> QOS_LEVEL_OFFSET);
+            // check wrong QoS level (both bits can't be set 1)
+            if (msg.qosLevel > QOS_LEVEL_EXACTLY_ONCE)
+                throw new MqttClientException(MqttClientErrorCode.QosNotAllowed);
+            // read DUP flag from fixed header
+            msg.dupFlag = (((fixedHeaderFirstByte & DUP_FLAG_MASK) >> DUP_FLAG_OFFSET) == 0x01);
+            // read retain flag from fixed header
+            msg.retain = (((fixedHeaderFirstByte & RETAIN_FLAG_MASK) >> RETAIN_FLAG_OFFSET) == 0x01);
+            
+            // message id is valid only with QOS level 1 or QOS level 2
+            if ((msg.qosLevel == QOS_LEVEL_AT_LEAST_ONCE) ||
+                (msg.qosLevel == QOS_LEVEL_EXACTLY_ONCE))
+            {
+                // message id
+                msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+                msg.messageId |= (buffer[index++]);
+            }
+
+            // get payload with message data
+            int messageSize = remainingLength - index;
+            int remaining = messageSize;
+            int messageOffset = 0;
+            msg.message = new byte[messageSize];
+
+            // BUG FIX 26/07/2013 : receiving large payload
+
+            // copy first part of payload data received
+            Array.Copy(buffer, index, msg.message, messageOffset, received - index);
+            remaining -= (received - index);
+            messageOffset += (received - index);
+
+            // if payload isn't finished
+            while (remaining > 0)
+            {
+                // receive other payload data
+                received = channel.Receive(buffer);
+                Array.Copy(buffer, 0, msg.message, messageOffset, received);
+                remaining -= received;
+                messageOffset += received;
+            }
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PUBLISH",
+                new object[] { "messageId", "topic", "message" },
+                new object[] { this.messageId, this.topic, this.message });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishEventArgs.cs
new file mode 100644
index 0000000..efb2333
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishEventArgs.cs
@@ -0,0 +1,111 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for PUBLISH message received from broker
+    /// </summary>
+    public class MqttMsgPublishEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message topic
+        /// </summary>
+        public string Topic
+        {
+            get { return this.topic; }
+            internal set { this.topic = value; }
+        }
+
+        /// <summary>
+        /// Message data
+        /// </summary>
+        public byte[] Message
+        {
+            get { return this.message; }
+            internal set { this.message = value; }
+        }
+
+        /// <summary>
+        /// Duplicate message flag
+        /// </summary>
+        public bool DupFlag
+        {
+            get { return this.dupFlag; }
+            set { this.dupFlag = value; }
+        }
+
+        /// <summary>
+        /// Quality of Service level
+        /// </summary>
+        public byte QosLevel
+        {
+            get { return this.qosLevel; }
+            internal set { this.qosLevel = value; }
+        }
+
+        /// <summary>
+        /// Retain message flag
+        /// </summary>
+        public bool Retain
+        {
+            get { return this.retain; }
+            internal set { this.retain = value; }
+        }
+
+        #endregion
+
+        // message topic
+        private string topic;
+        // message data
+        private byte[] message;
+        // duplicate delivery
+        private bool dupFlag;
+        // quality of service level
+        private byte qosLevel;
+        // retain flag
+        private bool retain;       
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="topic">Message topic</param>
+        /// <param name="message">Message data</param>
+        /// <param name="dupFlag">Duplicate delivery flag</param>
+        /// <param name="qosLevel">Quality of Service level</param>
+        /// <param name="retain">Retain flag</param>
+        public MqttMsgPublishEventArgs(string topic,
+            byte[] message,
+            bool dupFlag,
+            byte qosLevel,
+            bool retain)
+        {
+            this.topic = topic;
+            this.message = message;
+            this.dupFlag = dupFlag;
+            this.qosLevel = qosLevel;
+            this.retain = retain;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishedEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishedEventArgs.cs
new file mode 100644
index 0000000..e507c38
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPublishedEventArgs.cs
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for published message
+    /// </summary>
+    public class MqttMsgPublishedEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message identifier
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            internal set { this.messageId = value; }
+        }
+
+        /// <summary>
+        /// Message published (or failed due to retries)
+        /// </summary>
+        public bool IsPublished
+        {
+            get { return this.isPublished; }
+            internal set { this.isPublished = value; }
+        }
+
+        #endregion
+
+        // message identifier
+        ushort messageId;
+
+        // published flag
+        bool isPublished;
+
+        /// <summary>
+        /// Constructor (published message)
+        /// </summary>
+        /// <param name="messageId">Message identifier published</param>
+        public MqttMsgPublishedEventArgs(ushort messageId) 
+            : this(messageId, true) 
+        { 
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="messageId">Message identifier</param>
+        /// <param name="isPublished">Publish flag</param>
+        public MqttMsgPublishedEventArgs(ushort messageId, bool isPublished)
+        {
+            this.messageId = messageId;
+            this.isPublished = isPublished;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrec.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrec.cs
new file mode 100644
index 0000000..1855bf9
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrec.cs
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PUBREC message from broker to client
+    /// </summary>
+    public class MqttMsgPubrec : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPubrec()
+        {
+            this.type = MQTT_MSG_PUBREC_TYPE;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PUBREC_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PUBREC_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (MQTT_MSG_PUBREC_TYPE << MSG_TYPE_OFFSET);
+
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // get message identifier
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB 
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PUBREC message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PUBREC message instance</returns>
+        public static MqttMsgPubrec Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgPubrec msg = new MqttMsgPubrec();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PUBREC_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PUBREC",
+                new object[] { "messageId" },
+                new object[] { this.messageId });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrel.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrel.cs
new file mode 100644
index 0000000..e43ca91
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgPubrel.cs
@@ -0,0 +1,142 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for PUBREL message from client top broker
+    /// </summary>
+    public class MqttMsgPubrel : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgPubrel()
+        {
+            this.type = MQTT_MSG_PUBREL_TYPE;
+            // PUBREL message use QoS Level 1 (not "officially" in 3.1.1)
+            this.qosLevel = QOS_LEVEL_AT_LEAST_ONCE;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_PUBREL_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_PUBREL_FLAG_BITS; // [v.3.1.1]
+            else
+            {
+                buffer[index] = (byte)((MQTT_MSG_PUBREL_TYPE << MSG_TYPE_OFFSET) |
+                                   (this.qosLevel << QOS_LEVEL_OFFSET));
+                buffer[index] |= this.dupFlag ? (byte)(1 << DUP_FLAG_OFFSET) : (byte)0x00;
+                index++;
+            }
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // get next message identifier
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB 
+
+            return buffer;
+        }
+
+        /// <summary>
+        /// Parse bytes for a PUBREL message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>PUBREL message instance</returns>
+        public static MqttMsgPubrel Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgPubrel msg = new MqttMsgPubrel();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_PUBREL_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1)
+            {
+                // only 3.1.0
+
+                // read QoS level from fixed header (would be QoS Level 1)
+                msg.qosLevel = (byte)((fixedHeaderFirstByte & QOS_LEVEL_MASK) >> QOS_LEVEL_OFFSET);
+                // read DUP flag from fixed header
+                msg.dupFlag = (((fixedHeaderFirstByte & DUP_FLAG_MASK) >> DUP_FLAG_OFFSET) == 0x01);
+            }
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            return msg;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "PUBREL",
+                new object[] { "messageId" },
+                new object[] { this.messageId });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSuback.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSuback.cs
new file mode 100644
index 0000000..6ecfd0d
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSuback.cs
@@ -0,0 +1,162 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for SUBACK message from broker to client
+    /// </summary>
+    public class MqttMsgSuback : MqttMsgBase
+    {
+        #region Properties...
+
+        /// <summary>
+        /// List of granted QOS Levels
+        /// </summary>
+        public byte[] GrantedQoSLevels
+        {
+            get { return this.grantedQosLevels; }
+            set { this.grantedQosLevels = value; }
+        }
+
+        #endregion
+
+        // granted QOS levels
+        byte[] grantedQosLevels;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgSuback()
+        {
+            this.type = MQTT_MSG_SUBACK_TYPE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a SUBACK message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>SUBACK message instance</returns>
+        public static MqttMsgSuback Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgSuback msg = new MqttMsgSuback();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_SUBACK_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            // payload contains QoS levels granted
+            msg.grantedQosLevels = new byte[remainingLength - MESSAGE_ID_SIZE];
+            int qosIdx = 0;
+            do
+            {
+                msg.grantedQosLevels[qosIdx++] = buffer[index++];
+            } while (index < remainingLength);
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            int grantedQosIdx = 0;
+            for (grantedQosIdx = 0; grantedQosIdx < this.grantedQosLevels.Length; grantedQosIdx++)
+            {
+                payloadSize++;
+            }
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_SUBACK_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_SUBACK_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (byte)(MQTT_MSG_SUBACK_TYPE << MSG_TYPE_OFFSET);
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // message id
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB
+
+            // payload contains QoS levels granted
+            for (grantedQosIdx = 0; grantedQosIdx < this.grantedQosLevels.Length; grantedQosIdx++)
+            {
+                buffer[index++] = this.grantedQosLevels[grantedQosIdx];
+            }
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "SUBACK",
+                new object[] { "messageId", "grantedQosLevels" },
+                new object[] { this.messageId, this.grantedQosLevels });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribe.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribe.cs
new file mode 100644
index 0000000..0e3927e
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribe.cs
@@ -0,0 +1,272 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+// if NOT .Net Micro Framework
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System.Collections.Generic;
+#endif
+using System.Collections;
+using System.Text;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for SUBSCRIBE message from client to broker
+    /// </summary>
+    public class MqttMsgSubscribe : MqttMsgBase
+    {
+        #region Properties...
+
+        /// <summary>
+        /// List of topics to subscribe
+        /// </summary>
+        public string[] Topics
+        {
+            get { return this.topics; }
+            set { this.topics = value; }
+        }
+
+        /// <summary>
+        /// List of QOS Levels related to topics
+        /// </summary>
+        public byte[] QoSLevels
+        {
+            get { return this.qosLevels; }
+            set { this.qosLevels = value; }
+        }
+
+        #endregion
+
+        // topics to subscribe
+        string[] topics;
+        // QOS levels related to topics
+        byte[] qosLevels;
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgSubscribe()
+        {
+            this.type = MQTT_MSG_SUBSCRIBE_TYPE;
+        }
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="topics">List of topics to subscribe</param>
+        /// <param name="qosLevels">List of QOS Levels related to topics</param>
+        public MqttMsgSubscribe(string[] topics, byte[] qosLevels)
+        {
+            this.type = MQTT_MSG_SUBSCRIBE_TYPE;
+
+            this.topics = topics;
+            this.qosLevels = qosLevels;
+
+            // SUBSCRIBE message uses QoS Level 1 (not "officially" in 3.1.1)
+            this.qosLevel = QOS_LEVEL_AT_LEAST_ONCE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a SUBSCRIBE message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>SUBSCRIBE message instance</returns>
+        public static MqttMsgSubscribe Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            byte[] topicUtf8;
+            int topicUtf8Length;
+            MqttMsgSubscribe msg = new MqttMsgSubscribe();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_SUBSCRIBE_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            int received = channel.Receive(buffer);
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1)
+            {
+                // only 3.1.0
+
+                // read QoS level from fixed header
+                msg.qosLevel = (byte)((fixedHeaderFirstByte & QOS_LEVEL_MASK) >> QOS_LEVEL_OFFSET);
+                // read DUP flag from fixed header
+                msg.dupFlag = (((fixedHeaderFirstByte & DUP_FLAG_MASK) >> DUP_FLAG_OFFSET) == 0x01);
+                // retain flag not used
+                msg.retain = false;
+            }
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            // payload contains topics and QoS levels
+            // NOTE : before, I don't know how many topics will be in the payload (so use List)
+
+// if .Net Micro Framework
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+            IList tmpTopics = new ArrayList();
+            IList tmpQosLevels = new ArrayList();
+// else other frameworks (.Net, .Net Compact, Mono, Windows Phone) 
+#else
+            IList<String> tmpTopics = new List<String>();
+            IList<byte> tmpQosLevels = new List<byte>();
+#endif
+            do
+            {
+                // topic name
+                topicUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                topicUtf8Length |= buffer[index++];
+                topicUtf8 = new byte[topicUtf8Length];
+                Array.Copy(buffer, index, topicUtf8, 0, topicUtf8Length);
+                index += topicUtf8Length;
+                tmpTopics.Add(new String(Encoding.UTF8.GetChars(topicUtf8)));
+
+                // QoS level
+                tmpQosLevels.Add(buffer[index++]);
+
+            } while (index < remainingLength);
+
+            // copy from list to array
+            msg.topics = new string[tmpTopics.Count];
+            msg.qosLevels = new byte[tmpQosLevels.Count];
+            for (int i = 0; i < tmpTopics.Count; i++)
+            {
+                msg.topics[i] = (string)tmpTopics[i];
+                msg.qosLevels[i] = (byte)tmpQosLevels[i];
+            }
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // topics list empty
+            if ((this.topics == null) || (this.topics.Length == 0))
+                throw new MqttClientException(MqttClientErrorCode.TopicsEmpty);
+
+            // qos levels list empty
+            if ((this.qosLevels == null) || (this.qosLevels.Length == 0))
+                throw new MqttClientException(MqttClientErrorCode.QosLevelsEmpty);
+
+            // topics and qos levels lists length don't match
+            if (this.topics.Length != this.qosLevels.Length)
+                throw new MqttClientException(MqttClientErrorCode.TopicsQosLevelsNotMatch);
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            int topicIdx = 0;
+            byte[][] topicsUtf8 = new byte[this.topics.Length][];
+
+            for (topicIdx = 0; topicIdx < this.topics.Length; topicIdx++)
+            {
+                // check topic length
+                if ((this.topics[topicIdx].Length < MIN_TOPIC_LENGTH) || (this.topics[topicIdx].Length > MAX_TOPIC_LENGTH))
+                    throw new MqttClientException(MqttClientErrorCode.TopicLength);
+
+                topicsUtf8[topicIdx] = Encoding.UTF8.GetBytes(this.topics[topicIdx]);
+                payloadSize += 2; // topic size (MSB, LSB)
+                payloadSize += topicsUtf8[topicIdx].Length;
+                payloadSize++; // byte for QoS
+            }
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_SUBSCRIBE_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_SUBSCRIBE_FLAG_BITS; // [v.3.1.1]
+            else
+            {
+                buffer[index] = (byte)((MQTT_MSG_SUBSCRIBE_TYPE << MSG_TYPE_OFFSET) |
+                                   (this.qosLevel << QOS_LEVEL_OFFSET));
+                buffer[index] |= this.dupFlag ? (byte)(1 << DUP_FLAG_OFFSET) : (byte)0x00;
+                index++;
+            }
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // check message identifier assigned (SUBSCRIBE uses QoS Level 1, so message id is mandatory)
+            if (this.messageId == 0)
+                throw new MqttClientException(MqttClientErrorCode.WrongMessageId);
+            buffer[index++] = (byte)((messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(messageId & 0x00FF); // LSB 
+
+            topicIdx = 0;
+            for (topicIdx = 0; topicIdx < this.topics.Length; topicIdx++)
+            {
+                // topic name
+                buffer[index++] = (byte)((topicsUtf8[topicIdx].Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(topicsUtf8[topicIdx].Length & 0x00FF); // LSB
+                Array.Copy(topicsUtf8[topicIdx], 0, buffer, index, topicsUtf8[topicIdx].Length);
+                index += topicsUtf8[topicIdx].Length;
+
+                // requested QoS
+                buffer[index++] = this.qosLevels[topicIdx];
+            }
+            
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "SUBSCRIBE",
+                new object[] { "messageId", "topics", "qosLevels" },
+                new object[] { this.messageId, this.topics, this.qosLevels });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribeEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribeEventArgs.cs
new file mode 100644
index 0000000..91c85f9
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribeEventArgs.cs
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for subscribe request on topics
+    /// </summary>
+    public class MqttMsgSubscribeEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message identifier
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            internal set { this.messageId = value; }
+        }
+
+        /// <summary>
+        /// Topics requested to subscribe
+        /// </summary>
+        public string[] Topics
+        {
+            get { return this.topics; }
+            internal set { this.topics = value; }
+        }
+
+        /// <summary>
+        /// List of QOS Levels requested
+        /// </summary>
+        public byte[] QoSLevels
+        {
+            get { return this.qosLevels; }
+            internal set { this.qosLevels = value; }
+        }
+
+        #endregion
+
+        // message identifier
+        ushort messageId;
+        // topics requested to subscribe
+        string[] topics;
+        // QoS levels requested
+        byte[] qosLevels;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="messageId">Message identifier for subscribe topics request</param>
+        /// <param name="topics">Topics requested to subscribe</param>
+        /// <param name="qosLevels">List of QOS Levels requested</param>
+        public MqttMsgSubscribeEventArgs(ushort messageId, string[] topics, byte[] qosLevels)
+        {
+            this.messageId = messageId;
+            this.topics = topics;
+            this.qosLevels = qosLevels;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribedEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribedEventArgs.cs
new file mode 100644
index 0000000..58bbb22
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgSubscribedEventArgs.cs
@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for subscribed topics
+    /// </summary>
+    public class MqttMsgSubscribedEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message identifier
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            internal set { this.messageId = value; }
+        }
+
+        /// <summary>
+        /// List of granted QOS Levels
+        /// </summary>
+        public byte[] GrantedQoSLevels
+        {
+            get { return this.grantedQosLevels; }
+            internal set { this.grantedQosLevels = value; }
+        }
+
+        #endregion
+
+        // message identifier
+        ushort messageId;
+        // granted QOS levels
+        byte[] grantedQosLevels;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="messageId">Message identifier for subscribed topics</param>
+        /// <param name="grantedQosLevels">List of granted QOS Levels</param>
+        public MqttMsgSubscribedEventArgs(ushort messageId, byte[] grantedQosLevels)
+        {
+            this.messageId = messageId;
+            this.grantedQosLevels = grantedQosLevels;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsuback.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsuback.cs
new file mode 100644
index 0000000..8e49a06
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsuback.cs
@@ -0,0 +1,126 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for UNSUBACK message from broker to client
+    /// </summary>
+    public class MqttMsgUnsuback : MqttMsgBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgUnsuback()
+        {
+            this.type = MQTT_MSG_UNSUBACK_TYPE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a UNSUBACK message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>UNSUBACK message instance</returns>
+        public static MqttMsgUnsuback Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            MqttMsgUnsuback msg = new MqttMsgUnsuback();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_UNSUBACK_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            channel.Receive(buffer);
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_UNSUBACK_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_UNSUBACK_FLAG_BITS; // [v.3.1.1]
+            else
+                buffer[index++] = (byte)(MQTT_MSG_UNSUBACK_TYPE << MSG_TYPE_OFFSET);
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // message id
+            buffer[index++] = (byte)((this.messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(this.messageId & 0x00FF); // LSB
+
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "UNSUBACK",
+                new object[] { "messageId" },
+                new object[] { this.messageId });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribe.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribe.cs
new file mode 100644
index 0000000..e485133
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribe.cs
@@ -0,0 +1,239 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+// if NOT .Net Micro Framework
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System.Collections.Generic;
+#endif
+using System.Collections;
+using System.Text;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Class for UNSUBSCRIBE message from client to broker
+    /// </summary>
+    public class MqttMsgUnsubscribe : MqttMsgBase
+    {
+        #region Properties...
+
+        /// <summary>
+        /// List of topics to unsubscribe
+        /// </summary>
+        public string[] Topics
+        {
+            get { return this.topics; }
+            set { this.topics = value; }
+        }
+
+        #endregion
+
+        // topics to unsubscribe
+        string[] topics;
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttMsgUnsubscribe()
+        {
+            this.type = MQTT_MSG_UNSUBSCRIBE_TYPE;
+        }
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="topics">List of topics to unsubscribe</param>
+        public MqttMsgUnsubscribe(string[] topics)
+        {
+            this.type = MQTT_MSG_UNSUBSCRIBE_TYPE;
+
+            this.topics = topics;
+
+            // UNSUBSCRIBE message uses QoS Level 1 (not "officially" in 3.1.1)
+            this.qosLevel = QOS_LEVEL_AT_LEAST_ONCE;
+        }
+
+        /// <summary>
+        /// Parse bytes for a UNSUBSCRIBE message
+        /// </summary>
+        /// <param name="fixedHeaderFirstByte">First fixed header byte</param>
+        /// <param name="protocolVersion">Protocol Version</param>
+        /// <param name="channel">Channel connected to the broker</param>
+        /// <returns>UNSUBSCRIBE message instance</returns>
+        public static MqttMsgUnsubscribe Parse(byte fixedHeaderFirstByte, byte protocolVersion, IMqttNetworkChannel channel)
+        {
+            byte[] buffer;
+            int index = 0;
+            byte[] topicUtf8;
+            int topicUtf8Length;
+            MqttMsgUnsubscribe msg = new MqttMsgUnsubscribe();
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+            {
+                // [v3.1.1] check flag bits
+                if ((fixedHeaderFirstByte & MSG_FLAG_BITS_MASK) != MQTT_MSG_UNSUBSCRIBE_FLAG_BITS)
+                    throw new MqttClientException(MqttClientErrorCode.InvalidFlagBits);
+            }
+
+            // get remaining length and allocate buffer
+            int remainingLength = MqttMsgBase.decodeRemainingLength(channel);
+            buffer = new byte[remainingLength];
+
+            // read bytes from socket...
+            int received = channel.Receive(buffer);
+
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1)
+            {
+                // only 3.1.0
+
+                // read QoS level from fixed header
+                msg.qosLevel = (byte)((fixedHeaderFirstByte & QOS_LEVEL_MASK) >> QOS_LEVEL_OFFSET);
+                // read DUP flag from fixed header
+                msg.dupFlag = (((fixedHeaderFirstByte & DUP_FLAG_MASK) >> DUP_FLAG_OFFSET) == 0x01);
+                // retain flag not used
+                msg.retain = false;
+            }
+
+            // message id
+            msg.messageId = (ushort)((buffer[index++] << 8) & 0xFF00);
+            msg.messageId |= (buffer[index++]);
+
+            // payload contains topics
+            // NOTE : before, I don't know how many topics will be in the payload (so use List)
+
+// if .Net Micro Framework
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+            IList tmpTopics = new ArrayList();
+// else other frameworks (.Net, .Net Compact, Mono, Windows Phone) 
+#else
+            IList<String> tmpTopics = new List<String>();
+#endif
+            do
+            {
+                // topic name
+                topicUtf8Length = ((buffer[index++] << 8) & 0xFF00);
+                topicUtf8Length |= buffer[index++];
+                topicUtf8 = new byte[topicUtf8Length];
+                Array.Copy(buffer, index, topicUtf8, 0, topicUtf8Length);
+                index += topicUtf8Length;
+                tmpTopics.Add(new String(Encoding.UTF8.GetChars(topicUtf8)));
+            } while (index < remainingLength);
+
+            // copy from list to array
+            msg.topics = new string[tmpTopics.Count];
+            for (int i = 0; i < tmpTopics.Count; i++)
+            {
+                msg.topics[i] = (string)tmpTopics[i];
+            }
+
+            return msg;
+        }
+
+        public override byte[] GetBytes(byte protocolVersion)
+        {
+            int fixedHeaderSize = 0;
+            int varHeaderSize = 0;
+            int payloadSize = 0;
+            int remainingLength = 0;
+            byte[] buffer;
+            int index = 0;
+
+            // topics list empty
+            if ((this.topics == null) || (this.topics.Length == 0))
+                throw new MqttClientException(MqttClientErrorCode.TopicsEmpty);
+
+            // message identifier
+            varHeaderSize += MESSAGE_ID_SIZE;
+
+            int topicIdx = 0;
+            byte[][] topicsUtf8 = new byte[this.topics.Length][];
+
+            for (topicIdx = 0; topicIdx < this.topics.Length; topicIdx++)
+            {
+                // check topic length
+                if ((this.topics[topicIdx].Length < MIN_TOPIC_LENGTH) || (this.topics[topicIdx].Length > MAX_TOPIC_LENGTH))
+                    throw new MqttClientException(MqttClientErrorCode.TopicLength);
+
+                topicsUtf8[topicIdx] = Encoding.UTF8.GetBytes(this.topics[topicIdx]);
+                payloadSize += 2; // topic size (MSB, LSB)
+                payloadSize += topicsUtf8[topicIdx].Length;
+            }
+
+            remainingLength += (varHeaderSize + payloadSize);
+
+            // first byte of fixed header
+            fixedHeaderSize = 1;
+
+            int temp = remainingLength;
+            // increase fixed header size based on remaining length
+            // (each remaining length byte can encode until 128)
+            do
+            {
+                fixedHeaderSize++;
+                temp = temp / 128;
+            } while (temp > 0);
+
+            // allocate buffer for message
+            buffer = new byte[fixedHeaderSize + varHeaderSize + payloadSize];
+
+            // first fixed header byte
+            if (protocolVersion == MqttMsgConnect.PROTOCOL_VERSION_V3_1_1)
+                buffer[index++] = (MQTT_MSG_UNSUBSCRIBE_TYPE << MSG_TYPE_OFFSET) | MQTT_MSG_UNSUBSCRIBE_FLAG_BITS; // [v.3.1.1]
+            else
+            {
+                buffer[index] = (byte)((MQTT_MSG_UNSUBSCRIBE_TYPE << MSG_TYPE_OFFSET) |
+                                   (this.qosLevel << QOS_LEVEL_OFFSET));
+                buffer[index] |= this.dupFlag ? (byte)(1 << DUP_FLAG_OFFSET) : (byte)0x00;
+                index++;
+            }
+            
+            // encode remaining length
+            index = this.encodeRemainingLength(remainingLength, buffer, index);
+
+            // check message identifier assigned
+            if (this.messageId == 0)
+                throw new MqttClientException(MqttClientErrorCode.WrongMessageId);
+            buffer[index++] = (byte)((messageId >> 8) & 0x00FF); // MSB
+            buffer[index++] = (byte)(messageId & 0x00FF); // LSB 
+
+            topicIdx = 0;
+            for (topicIdx = 0; topicIdx < this.topics.Length; topicIdx++)
+            {
+                // topic name
+                buffer[index++] = (byte)((topicsUtf8[topicIdx].Length >> 8) & 0x00FF); // MSB
+                buffer[index++] = (byte)(topicsUtf8[topicIdx].Length & 0x00FF); // LSB
+                Array.Copy(topicsUtf8[topicIdx], 0, buffer, index, topicsUtf8[topicIdx].Length);
+                index += topicsUtf8[topicIdx].Length;
+            }
+            
+            return buffer;
+        }
+
+        public override string ToString()
+        {
+#if TRACE
+            return this.GetTraceString(
+                "UNSUBSCRIBE",
+                new object[] { "messageId", "topics" },
+                new object[] { this.messageId, this.topics });
+#else
+            return base.ToString();
+#endif
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribeEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribeEventArgs.cs
new file mode 100644
index 0000000..e158783
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribeEventArgs.cs
@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for unsubscribe request on topics
+    /// </summary>
+    public class MqttMsgUnsubscribeEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message identifier
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            internal set { this.messageId = value; }
+        }
+
+        /// <summary>
+        /// Topics requested to subscribe
+        /// </summary>
+        public string[] Topics
+        {
+            get { return this.topics; }
+            internal set { this.topics = value; }
+        }
+
+        #endregion
+
+        // message identifier
+        ushort messageId;
+        // topics requested to unsubscribe
+        string[] topics;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="messageId">Message identifier for subscribed topics</param>
+        /// <param name="topics">Topics requested to subscribe</param>
+        public MqttMsgUnsubscribeEventArgs(ushort messageId, string[] topics)
+        {
+            this.messageId = messageId;
+            this.topics = topics;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribedEventArgs.cs b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribedEventArgs.cs
new file mode 100644
index 0000000..e65c383
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Messages/MqttMsgUnsubscribedEventArgs.cs
@@ -0,0 +1,55 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+using System;
+#else
+using Microsoft.SPOT;
+#endif
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    /// <summary>
+    /// Event Args class for unsubscribed topic
+    /// </summary>
+    public class MqttMsgUnsubscribedEventArgs : EventArgs
+    {
+        #region Properties...
+
+        /// <summary>
+        /// Message identifier
+        /// </summary>
+        public ushort MessageId
+        {
+            get { return this.messageId; }
+            internal set { this.messageId = value; }
+        }
+
+        #endregion
+
+        // message identifier
+        ushort messageId;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="messageId">Message identifier for unsubscribed topic</param>
+        public MqttMsgUnsubscribedEventArgs(ushort messageId)
+        {
+            this.messageId = messageId;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/MqttClient.cs b/Librarys/mqtt/M2Mqtt/MqttClient.cs
new file mode 100644
index 0000000..444c027
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/MqttClient.cs
@@ -0,0 +1,2632 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Net;
+#if !(WINDOWS_APP || WINDOWS_PHONE_APP)
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+#endif
+using System.Threading;
+using uPLibrary.Networking.M2Mqtt.Exceptions;
+using uPLibrary.Networking.M2Mqtt.Messages;
+using uPLibrary.Networking.M2Mqtt.Session;
+using uPLibrary.Networking.M2Mqtt.Utility;
+using uPLibrary.Networking.M2Mqtt.Internal;
+// if .Net Micro Framework
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+using Microsoft.SPOT;
+#if SSL
+using Microsoft.SPOT.Net.Security;
+#endif
+// else other frameworks (.Net, .Net Compact, Mono, Windows Phone) 
+#else
+using System.Collections.Generic;
+#if (SSL && !(WINDOWS_APP || WINDOWS_PHONE_APP))
+using System.Security.Authentication;
+using System.Net.Security;
+#endif
+#endif
+
+#if (WINDOWS_APP || WINDOWS_PHONE_APP)
+using Windows.Networking.Sockets;
+#endif
+
+using System.Collections;
+
+// alias needed due to Microsoft.SPOT.Trace in .Net Micro Framework
+// (it's ambiguos with uPLibrary.Networking.M2Mqtt.Utility.Trace)
+using MqttUtility = uPLibrary.Networking.M2Mqtt.Utility;
+using System.IO;
+using System.Net.Security;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// MQTT Client
+    /// </summary>
+    public class MqttClient
+    {
+#if BROKER
+        #region Constants ...
+
+        // thread names
+        private const string RECEIVE_THREAD_NAME = "ReceiveThread";
+        private const string RECEIVE_EVENT_THREAD_NAME = "DispatchEventThread";
+        private const string PROCESS_INFLIGHT_THREAD_NAME = "ProcessInflightThread";
+        private const string KEEP_ALIVE_THREAD = "KeepAliveThread";
+
+        #endregion
+#endif
+
+        /// <summary>
+        /// Delagate that defines event handler for PUBLISH message received
+        /// </summary>
+        public delegate void MqttMsgPublishEventHandler(object sender, MqttMsgPublishEventArgs e);
+
+        /// <summary>
+        /// Delegate that defines event handler for published message
+        /// </summary>
+        public delegate void MqttMsgPublishedEventHandler(object sender, MqttMsgPublishedEventArgs e);
+
+        /// <summary>
+        /// Delagate that defines event handler for subscribed topic
+        /// </summary>
+        public delegate void MqttMsgSubscribedEventHandler(object sender, MqttMsgSubscribedEventArgs e);
+
+        /// <summary>
+        /// Delagate that defines event handler for unsubscribed topic
+        /// </summary>
+        public delegate void MqttMsgUnsubscribedEventHandler(object sender, MqttMsgUnsubscribedEventArgs e);
+
+#if BROKER
+        /// <summary>
+        /// Delagate that defines event handler for SUBSCRIBE message received
+        /// </summary>
+        public delegate void MqttMsgSubscribeEventHandler(object sender, MqttMsgSubscribeEventArgs e);
+
+        /// <summary>
+        /// Delagate that defines event handler for UNSUBSCRIBE message received
+        /// </summary>
+        public delegate void MqttMsgUnsubscribeEventHandler(object sender, MqttMsgUnsubscribeEventArgs e);
+
+        /// <summary>
+        /// Delagate that defines event handler for CONNECT message received
+        /// </summary>
+        public delegate void MqttMsgConnectEventHandler(object sender, MqttMsgConnectEventArgs e);
+
+        /// <summary>
+        /// Delegate that defines event handler for client disconnection (DISCONNECT message or not)
+        /// </summary>
+        public delegate void MqttMsgDisconnectEventHandler(object sender, EventArgs e);
+#endif
+
+        /// <summary>
+        /// Delegate that defines event handler for cliet/peer disconnection
+        /// </summary>
+        public delegate void ConnectionClosedEventHandler(object sender, EventArgs e);
+
+        // broker hostname (or ip address) and port
+        private string brokerHostName;
+        private int brokerPort;
+
+        // running status of threads
+        private bool isRunning;
+        // event for raising received message event
+        private AutoResetEvent receiveEventWaitHandle;
+
+        // event for starting process inflight queue asynchronously
+        private AutoResetEvent inflightWaitHandle;
+
+        // event for signaling synchronous receive
+        AutoResetEvent syncEndReceiving;
+        // message received
+        MqttMsgBase msgReceived;
+
+        // exeption thrown during receiving
+        Exception exReceiving;
+
+        // keep alive period (in ms)
+        private int keepAlivePeriod;
+        // events for signaling on keep alive thread
+        private AutoResetEvent keepAliveEvent;
+        private AutoResetEvent keepAliveEventEnd;
+        // last communication time in ticks
+        private int lastCommTime;
+
+        // event for PUBLISH message received
+        public event MqttMsgPublishEventHandler MqttMsgPublishReceived;
+        // event for published message
+        public event MqttMsgPublishedEventHandler MqttMsgPublished;
+        // event for subscribed topic
+        public event MqttMsgSubscribedEventHandler MqttMsgSubscribed;
+        // event for unsubscribed topic
+        public event MqttMsgUnsubscribedEventHandler MqttMsgUnsubscribed;
+#if BROKER
+        // event for SUBSCRIBE message received
+        public event MqttMsgSubscribeEventHandler MqttMsgSubscribeReceived;
+        // event for USUBSCRIBE message received
+        public event MqttMsgUnsubscribeEventHandler MqttMsgUnsubscribeReceived;
+        // event for CONNECT message received
+        public event MqttMsgConnectEventHandler MqttMsgConnected;
+        // event for DISCONNECT message received
+        public event MqttMsgDisconnectEventHandler MqttMsgDisconnected;
+#endif
+
+        // event for peer/client disconnection
+        public event ConnectionClosedEventHandler ConnectionClosed;
+        
+        // channel to communicate over the network
+        private IMqttNetworkChannel channel;
+
+        // inflight messages queue
+        private Queue inflightQueue;
+        // internal queue for received messages about inflight messages
+        private Queue internalQueue;
+        // internal queue for dispatching events
+        private Queue eventQueue;
+        // session
+        private MqttClientSession session;
+
+        // reference to avoid access to singleton via property
+        private MqttSettings settings;
+
+        // current message identifier generated
+        private ushort messageIdCounter = 0;
+
+        // connection is closing due to peer
+        private bool isConnectionClosing;
+
+        /// <summary>
+        /// Connection status between client and broker
+        /// </summary>
+        public bool IsConnected { get; private set; }
+
+        /// <summary>
+        /// Client identifier
+        /// </summary>
+        public string ClientId { get; private set; }
+
+        /// <summary>
+        /// Clean session flag
+        /// </summary>
+        public bool CleanSession { get; private set; }
+
+        /// <summary>
+        /// Will flag
+        /// </summary>
+        public bool WillFlag { get; private set; }
+
+        /// <summary>
+        /// Will QOS level
+        /// </summary>
+        public byte WillQosLevel { get; private set; }
+
+        /// <summary>
+        /// Will topic
+        /// </summary>
+        public string WillTopic { get; private set; }
+
+        /// <summary>
+        /// Will message
+        /// </summary>
+        public string WillMessage { get; private set; }
+
+        /// <summary>
+        /// MQTT protocol version
+        /// </summary>
+        public MqttProtocolVersion ProtocolVersion { get; set; }
+
+#if BROKER
+        /// <summary>
+        /// MQTT Client Session
+        /// </summary>
+        public MqttClientSession Session
+        {
+            get { return this.session; }
+            set { this.session = value; }
+        }
+#endif
+
+        /// <summary>
+        /// MQTT client settings
+        /// </summary>
+        public MqttSettings Settings
+        {
+            get { return this.settings; }
+        }
+
+#if !(WINDOWS_APP || WINDOWS_PHONE_APP) 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerIpAddress">Broker IP address</param>
+        [Obsolete("Use this ctor MqttClient(string brokerHostName) insted")]
+        public MqttClient(IPAddress brokerIpAddress) :
+            this(brokerIpAddress, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, null, null, MqttSslProtocols.None)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerIpAddress">Broker IP address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">Using secure connection</param>
+        /// <param name="caCert">CA certificate for secure connection</param>
+        /// <param name="clientCert">Client certificate</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+        [Obsolete("Use this ctor MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert) insted")]
+        public MqttClient(IPAddress brokerIpAddress, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)
+        {
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, clientCert, sslProtocol, null, null);
+#else
+            this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, clientCert, sslProtocol);
+#endif
+        }
+#endif
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        public MqttClient(string brokerHostName) :
+#if !(WINDOWS_APP || WINDOWS_PHONE_APP)
+            this(brokerHostName, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, null, null, MqttSslProtocols.None)
+#else
+            this(brokerHostName, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, MqttSslProtocols.None)
+#endif
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">Using secure connection</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+#if !(WINDOWS_APP || WINDOWS_PHONE_APP)
+        /// <param name="caCert">CA certificate for secure connection</param>
+        /// <param name="clientCert">Client certificate</param>
+        public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)            
+#else
+        public MqttClient(string brokerHostName, int brokerPort, bool secure, MqttSslProtocols sslProtocol)            
+#endif
+        {
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK || WINDOWS_APP || WINDOWS_PHONE_APP)
+            this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, null, null);
+#elif (WINDOWS_APP || WINDOWS_PHONE_APP)
+            this.Init(brokerHostName, brokerPort, secure, sslProtocol);
+#else
+            this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol);
+#endif
+        }
+
+
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK || WINDOWS_APP || WINDOWS_PHONE_APP)
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">Using secure connection</param>
+        /// <param name="caCert">CA certificate for secure connection</param>
+        /// <param name="clientCert">Client certificate</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+        /// <param name="userCertificateValidationCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
+            RemoteCertificateValidationCallback userCertificateValidationCallback)
+            : this(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, null)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">Using secure connection</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+        /// <param name="userCertificateValidationCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        /// <param name="userCertificateSelectionCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
+        public MqttClient(string brokerHostName, int brokerPort, bool secure, MqttSslProtocols sslProtocol, 
+            RemoteCertificateValidationCallback userCertificateValidationCallback, 
+            LocalCertificateSelectionCallback userCertificateSelectionCallback)
+            : this(brokerHostName, brokerPort, secure, null, null, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">Using secure connection</param>
+        /// <param name="caCert">CA certificate for secure connection</param>
+        /// <param name="clientCert">Client certificate</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+        /// <param name="userCertificateValidationCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        /// <param name="userCertificateSelectionCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
+        public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
+            RemoteCertificateValidationCallback userCertificateValidationCallback,
+            LocalCertificateSelectionCallback userCertificateSelectionCallback)
+        {
+            this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback);
+        }
+#endif
+
+#if BROKER
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="channel">Network channel for communication</param>
+        public MqttClient(IMqttNetworkChannel channel)
+        {
+            // set default MQTT protocol version (default is 3.1.1)
+            this.ProtocolVersion = MqttProtocolVersion.Version_3_1_1;
+
+            this.channel = channel;
+
+            // reference to MQTT settings
+            this.settings = MqttSettings.Instance;
+
+            // client not connected yet (CONNACK not send from client), some default values
+            this.IsConnected = false;
+            this.ClientId = null;
+            this.CleanSession = true;
+
+            this.keepAliveEvent = new AutoResetEvent(false);
+
+            // queue for handling inflight messages (publishing and acknowledge)
+            this.inflightWaitHandle = new AutoResetEvent(false);
+            this.inflightQueue = new Queue();
+
+            // queue for received message
+            this.receiveEventWaitHandle = new AutoResetEvent(false);
+            this.eventQueue = new Queue();
+            this.internalQueue = new Queue();
+
+            // session
+            this.session = null;
+        }
+#endif
+
+        /// <summary>
+        /// MqttClient initialization
+        /// </summary>
+        /// <param name="brokerHostName">Broker Host Name or IP Address</param>
+        /// <param name="brokerPort">Broker port</param>
+        /// <param name="secure">>Using secure connection</param>
+        /// <param name="caCert">CA certificate for secure connection</param>
+        /// <param name="clientCert">Client certificate</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK || WINDOWS_APP || WINDOWS_PHONE_APP)
+        /// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        /// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
+        private void Init(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
+            RemoteCertificateValidationCallback userCertificateValidationCallback,
+            LocalCertificateSelectionCallback userCertificateSelectionCallback)
+#elif (WINDOWS_APP || WINDOWS_PHONE_APP)
+        private void Init(string brokerHostName, int brokerPort, bool secure, MqttSslProtocols sslProtocol)
+#else
+        private void Init(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)
+#endif
+        {
+            // set default MQTT protocol version (default is 3.1.1)
+            this.ProtocolVersion = MqttProtocolVersion.Version_3_1_1;
+#if !SSL
+            // check security parameters
+            if (secure)
+                throw new ArgumentException("Library compiled without SSL support");
+#endif
+
+            this.brokerHostName = brokerHostName;
+            this.brokerPort = brokerPort;
+
+            // reference to MQTT settings
+            this.settings = MqttSettings.Instance;
+            // set settings port based on secure connection or not
+            if (!secure)
+                this.settings.Port = this.brokerPort;
+            else
+                this.settings.SslPort = this.brokerPort;
+
+            this.syncEndReceiving = new AutoResetEvent(false);
+            this.keepAliveEvent = new AutoResetEvent(false);
+
+            // queue for handling inflight messages (publishing and acknowledge)
+            this.inflightWaitHandle = new AutoResetEvent(false);
+            this.inflightQueue = new Queue();
+
+            // queue for received message
+            this.receiveEventWaitHandle = new AutoResetEvent(false);
+            this.eventQueue = new Queue();
+            this.internalQueue = new Queue();
+
+            // session
+            this.session = null;
+
+            // create network channel
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK || WINDOWS_APP || WINDOWS_PHONE_APP)
+            this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback);
+#elif (WINDOWS_APP || WINDOWS_PHONE_APP)
+            this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, sslProtocol);
+#else
+            this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, caCert, clientCert, sslProtocol);
+#endif
+        }
+
+        /// <summary>
+        /// Connect to broker
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        /// <returns>Return code of CONNACK message from broker</returns>
+        public byte Connect(string clientId)
+        {
+            return this.Connect(clientId, null, null, false, MqttMsgConnect.QOS_LEVEL_AT_MOST_ONCE, false, null, null, true, MqttMsgConnect.KEEP_ALIVE_PERIOD_DEFAULT);
+        }
+
+        /// <summary>
+        /// Connect to broker
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        /// <param name="username">Username</param>
+        /// <param name="password">Password</param>
+        /// <returns>Return code of CONNACK message from broker</returns>
+        public byte Connect(string clientId,
+            string username,
+            string password)
+        {
+            return this.Connect(clientId, username, password, false, MqttMsgConnect.QOS_LEVEL_AT_MOST_ONCE, false, null, null, true, MqttMsgConnect.KEEP_ALIVE_PERIOD_DEFAULT);
+        }
+
+        /// <summary>
+        /// Connect to broker
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        /// <param name="username">Username</param>
+        /// <param name="password">Password</param>
+        /// <param name="cleanSession">Clean sessione flag</param>
+        /// <param name="keepAlivePeriod">Keep alive period</param>
+        /// <returns>Return code of CONNACK message from broker</returns>
+        public byte Connect(string clientId,
+            string username,
+            string password,
+            bool cleanSession,
+            ushort keepAlivePeriod)
+        {
+            return this.Connect(clientId, username, password, false, MqttMsgConnect.QOS_LEVEL_AT_MOST_ONCE, false, null, null, cleanSession, keepAlivePeriod);
+        }
+
+        /// <summary>
+        /// Connect to broker
+        /// </summary>
+        /// <param name="clientId">Client identifier</param>
+        /// <param name="username">Username</param>
+        /// <param name="password">Password</param>
+        /// <param name="willRetain">Will retain flag</param>
+        /// <param name="willQosLevel">Will QOS level</param>
+        /// <param name="willFlag">Will flag</param>
+        /// <param name="willTopic">Will topic</param>
+        /// <param name="willMessage">Will message</param>
+        /// <param name="cleanSession">Clean sessione flag</param>
+        /// <param name="keepAlivePeriod">Keep alive period</param>
+        /// <returns>Return code of CONNACK message from broker</returns>
+        public byte Connect(string clientId,
+            string username,
+            string password,
+            bool willRetain,
+            byte willQosLevel,
+            bool willFlag,
+            string willTopic,
+            string willMessage,
+            bool cleanSession,
+            ushort keepAlivePeriod)
+        {
+            // create CONNECT message
+            MqttMsgConnect connect = new MqttMsgConnect(clientId,
+                username,
+                password,
+                willRetain,
+                willQosLevel,
+                willFlag,
+                willTopic,
+                willMessage,
+                cleanSession,
+                keepAlivePeriod,
+                (byte)this.ProtocolVersion);
+
+            try
+            {
+                // connect to the broker
+                this.channel.Connect();
+            }
+            catch (Exception ex)
+            {
+                throw new MqttConnectionException("Exception connecting to the broker", ex);
+            }
+
+            this.lastCommTime = 0;
+            this.isRunning = true;
+            this.isConnectionClosing = false;
+            // start thread for receiving messages from broker
+            Fx.StartThread(this.ReceiveThread);
+            
+            MqttMsgConnack connack = (MqttMsgConnack)this.SendReceive(connect);
+            // if connection accepted, start keep alive timer and 
+            if (connack.ReturnCode == MqttMsgConnack.CONN_ACCEPTED)
+            {
+                // set all client properties
+                this.ClientId = clientId;
+                this.CleanSession = cleanSession;
+                this.WillFlag = willFlag;
+                this.WillTopic = willTopic;
+                this.WillMessage = willMessage;
+                this.WillQosLevel = willQosLevel;
+
+                this.keepAlivePeriod = keepAlivePeriod * 1000; // convert in ms
+
+                // restore previous session
+                this.RestoreSession();
+
+                // keep alive period equals zero means turning off keep alive mechanism
+                if (this.keepAlivePeriod != 0)
+                {
+                    // start thread for sending keep alive message to the broker
+                    Fx.StartThread(this.KeepAliveThread);
+                }
+
+                // start thread for raising received message event from broker
+                Fx.StartThread(this.DispatchEventThread);
+                
+                // start thread for handling inflight messages queue to broker asynchronously (publish and acknowledge)
+                Fx.StartThread(this.ProcessInflightThread);
+
+                this.IsConnected = true;
+            }
+            return connack.ReturnCode;
+        }
+
+        /// <summary>
+        /// Disconnect from broker
+        /// </summary>
+        public void Disconnect()
+        {
+            MqttMsgDisconnect disconnect = new MqttMsgDisconnect();
+            this.Send(disconnect);
+
+            // close client
+            this.OnConnectionClosing();
+        }
+
+#if BROKER
+        /// <summary>
+        /// Open client communication
+        /// </summary>
+        public void Open()
+        {
+            this.isRunning = true;
+
+            // start thread for receiving messages from client
+            Fx.StartThread(this.ReceiveThread);
+
+            // start thread for raising received message event from client
+            Fx.StartThread(this.DispatchEventThread);
+
+            // start thread for handling inflight messages queue to client asynchronously (publish and acknowledge)
+            Fx.StartThread(this.ProcessInflightThread);   
+        }
+#endif
+
+        /// <summary>
+        /// Close client
+        /// </summary>
+#if BROKER
+        public void Close()
+#else
+        private void Close()
+#endif
+        {
+            // stop receiving thread
+            this.isRunning = false;
+
+            // wait end receive event thread
+            if (this.receiveEventWaitHandle != null)
+                this.receiveEventWaitHandle.Set();
+
+            // wait end process inflight thread
+            if (this.inflightWaitHandle != null)
+                this.inflightWaitHandle.Set();
+
+#if BROKER
+            // unlock keep alive thread
+            this.keepAliveEvent.Set();
+#else
+            // unlock keep alive thread and wait
+            this.keepAliveEvent.Set();
+
+            if (this.keepAliveEventEnd != null)
+                this.keepAliveEventEnd.WaitOne();
+#endif
+
+            // clear all queues
+            this.inflightQueue.Clear();
+            this.internalQueue.Clear();
+            this.eventQueue.Clear();
+
+            // close network channel
+            this.channel.Close();
+
+            this.IsConnected = false;
+        }
+
+        /// <summary>
+        /// Execute ping to broker for keep alive
+        /// </summary>
+        /// <returns>PINGRESP message from broker</returns>
+        private MqttMsgPingResp Ping()
+        {
+            MqttMsgPingReq pingreq = new MqttMsgPingReq();
+            try
+            {
+                // broker must send PINGRESP within timeout equal to keep alive period
+                return (MqttMsgPingResp)this.SendReceive(pingreq, this.keepAlivePeriod);
+            }
+            catch (Exception e)
+            {
+#if TRACE
+                MqttUtility.Trace.WriteLine(TraceLevel.Error, "Exception occurred: {0}", e.ToString());
+#endif
+
+                // client must close connection
+                this.OnConnectionClosing();
+                return null;
+            }
+        }
+
+#if BROKER
+        /// <summary>
+        /// Send CONNACK message to the client (connection accepted or not)
+        /// </summary>
+        /// <param name="connect">CONNECT message with all client information</param>
+        /// <param name="returnCode">Return code for CONNACK message</param>
+        /// <param name="clientId">If not null, client id assigned by broker</param>
+        /// <param name="sessionPresent">Session present on the broker</param>
+        public void Connack(MqttMsgConnect connect, byte returnCode, string clientId, bool sessionPresent)
+        {
+            this.lastCommTime = 0;
+
+            // create CONNACK message and ...
+            MqttMsgConnack connack = new MqttMsgConnack();
+            connack.ReturnCode = returnCode;
+            // [v3.1.1] session present flag
+            if (this.ProtocolVersion == MqttProtocolVersion.Version_3_1_1)
+                connack.SessionPresent = sessionPresent;
+            // ... send it to the client
+            this.Send(connack);
+
+            // connection accepted, start keep alive thread checking
+            if (connack.ReturnCode == MqttMsgConnack.CONN_ACCEPTED)
+            {
+                // [v3.1.1] if client id isn't null, the CONNECT message has a cliend id with zero bytes length
+                //          and broker assigned a unique identifier to the client
+                this.ClientId = (clientId == null) ? connect.ClientId : clientId;
+                this.CleanSession = connect.CleanSession;
+                this.WillFlag = connect.WillFlag;
+                this.WillTopic = connect.WillTopic;
+                this.WillMessage = connect.WillMessage;
+                this.WillQosLevel = connect.WillQosLevel;
+
+                this.keepAlivePeriod = connect.KeepAlivePeriod * 1000; // convert in ms
+                // broker has a tolerance of 1.5 specified keep alive period
+                this.keepAlivePeriod += (this.keepAlivePeriod / 2);
+
+                // start thread for checking keep alive period timeout
+                Fx.StartThread(this.KeepAliveThread);
+
+                this.isConnectionClosing = false;
+                this.IsConnected = true;
+            }
+            // connection refused, close TCP/IP channel
+            else
+            {
+                this.Close();
+            }
+        }
+
+        /// <summary>
+        /// Send SUBACK message to the client
+        /// </summary>
+        /// <param name="messageId">Message Id for the SUBSCRIBE message that is being acknowledged</param>
+        /// <param name="grantedQosLevels">Granted QoS Levels</param>
+        public void Suback(ushort messageId, byte[] grantedQosLevels)
+        {
+            MqttMsgSuback suback = new MqttMsgSuback();
+            suback.MessageId = messageId;
+            suback.GrantedQoSLevels = grantedQosLevels;
+
+            this.Send(suback);
+        }
+
+        /// <summary>
+        /// Send UNSUBACK message to the client
+        /// </summary>
+        /// <param name="messageId">Message Id for the UNSUBSCRIBE message that is being acknowledged</param>
+        public void Unsuback(ushort messageId)
+        {
+            MqttMsgUnsuback unsuback = new MqttMsgUnsuback();
+            unsuback.MessageId = messageId;
+
+            this.Send(unsuback);
+        }
+#endif
+
+        /// <summary>
+        /// Subscribe for message topics
+        /// </summary>
+        /// <param name="topics">List of topics to subscribe</param>
+        /// <param name="qosLevels">QOS levels related to topics</param>
+        /// <returns>Message Id related to SUBSCRIBE message</returns>
+        public ushort Subscribe(string[] topics, byte[] qosLevels)
+        {
+            MqttMsgSubscribe subscribe =
+                new MqttMsgSubscribe(topics, qosLevels);
+            subscribe.MessageId = this.GetMessageId();
+
+            // enqueue subscribe request into the inflight queue
+            this.EnqueueInflight(subscribe, MqttMsgFlow.ToPublish);
+
+            return subscribe.MessageId;
+        }
+
+        /// <summary>
+        /// Unsubscribe for message topics
+        /// </summary>
+        /// <param name="topics">List of topics to unsubscribe</param>
+        /// <returns>Message Id in UNSUBACK message from broker</returns>
+        public ushort Unsubscribe(string[] topics)
+        {
+            MqttMsgUnsubscribe unsubscribe =
+                new MqttMsgUnsubscribe(topics);
+            unsubscribe.MessageId = this.GetMessageId();
+
+            // enqueue unsubscribe request into the inflight queue
+            this.EnqueueInflight(unsubscribe, MqttMsgFlow.ToPublish);
+
+            return unsubscribe.MessageId;
+        }
+
+        /// <summary>
+        /// Publish a message asynchronously (QoS Level 0 and not retained)
+        /// </summary>
+        /// <param name="topic">Message topic</param>
+        /// <param name="message">Message data (payload)</param>
+        /// <returns>Message Id related to PUBLISH message</returns>
+        public ushort Publish(string topic, byte[] message)
+        {
+            return this.Publish(topic, message, MqttMsgBase.QOS_LEVEL_AT_MOST_ONCE, false);
+        }
+
+        /// <summary>
+        /// Publish a message asynchronously
+        /// </summary>
+        /// <param name="topic">Message topic</param>
+        /// <param name="message">Message data (payload)</param>
+        /// <param name="qosLevel">QoS Level</param>
+        /// <param name="retain">Retain flag</param>
+        /// <returns>Message Id related to PUBLISH message</returns>
+        public ushort Publish(string topic, byte[] message, byte qosLevel, bool retain)
+        {
+            MqttMsgPublish publish =
+                    new MqttMsgPublish(topic, message, false, qosLevel, retain);
+            publish.MessageId = this.GetMessageId();
+
+            // enqueue message to publish into the inflight queue
+            bool enqueue = this.EnqueueInflight(publish, MqttMsgFlow.ToPublish);
+
+            // message enqueued
+            if (enqueue)
+                return publish.MessageId;
+            // infligh queue full, message not enqueued
+            else
+                throw new MqttClientException(MqttClientErrorCode.InflightQueueFull);
+        }
+
+        /// <summary>
+        /// Wrapper method for raising events
+        /// </summary>
+        /// <param name="internalEvent">Internal event</param>
+        private void OnInternalEvent(InternalEvent internalEvent)
+        {
+            lock (this.eventQueue)
+            {
+                this.eventQueue.Enqueue(internalEvent);
+            }
+
+            this.receiveEventWaitHandle.Set();
+        }
+
+        /// <summary>
+        /// Wrapper method for raising closing connection event
+        /// </summary>
+        private void OnConnectionClosing()
+        {
+            if (!this.isConnectionClosing)
+            {
+                this.isConnectionClosing = true;
+                this.receiveEventWaitHandle.Set();
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising PUBLISH message received event
+        /// </summary>
+        /// <param name="publish">PUBLISH message received</param>
+        private void OnMqttMsgPublishReceived(MqttMsgPublish publish)
+        {
+            if (this.MqttMsgPublishReceived != null)
+            {
+                this.MqttMsgPublishReceived(this,
+                    new MqttMsgPublishEventArgs(publish.Topic, publish.Message, publish.DupFlag, publish.QosLevel, publish.Retain));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising published message event
+        /// </summary>
+        /// <param name="messageId">Message identifier for published message</param>
+        /// <param name="isPublished">Publish flag</param>
+        private void OnMqttMsgPublished(ushort messageId, bool isPublished)
+        {
+            if (this.MqttMsgPublished != null)
+            {
+                this.MqttMsgPublished(this,
+                    new MqttMsgPublishedEventArgs(messageId, isPublished));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising subscribed topic event
+        /// </summary>
+        /// <param name="suback">SUBACK message received</param>
+        private void OnMqttMsgSubscribed(MqttMsgSuback suback)
+        {
+            if (this.MqttMsgSubscribed != null)
+            {
+                this.MqttMsgSubscribed(this,
+                    new MqttMsgSubscribedEventArgs(suback.MessageId, suback.GrantedQoSLevels));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising unsubscribed topic event
+        /// </summary>
+        /// <param name="messageId">Message identifier for unsubscribed topic</param>
+        private void OnMqttMsgUnsubscribed(ushort messageId)
+        {
+            if (this.MqttMsgUnsubscribed != null)
+            {
+                this.MqttMsgUnsubscribed(this,
+                    new MqttMsgUnsubscribedEventArgs(messageId));
+            }
+        }
+
+#if BROKER
+        /// <summary>
+        /// Wrapper method for raising SUBSCRIBE message event
+        /// </summary>
+        /// <param name="messageId">Message identifier for subscribe topics request</param>
+        /// <param name="topics">Topics requested to subscribe</param>
+        /// <param name="qosLevels">List of QOS Levels requested</param>
+        private void OnMqttMsgSubscribeReceived(ushort messageId, string[] topics, byte[] qosLevels)
+        {
+            if (this.MqttMsgSubscribeReceived != null)
+            {
+                this.MqttMsgSubscribeReceived(this,
+                    new MqttMsgSubscribeEventArgs(messageId, topics, qosLevels));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising UNSUBSCRIBE message event
+        /// </summary>
+        /// <param name="messageId">Message identifier for unsubscribe topics request</param>
+        /// <param name="topics">Topics requested to unsubscribe</param>
+        private void OnMqttMsgUnsubscribeReceived(ushort messageId, string[] topics)
+        {
+            if (this.MqttMsgUnsubscribeReceived != null)
+            {
+                this.MqttMsgUnsubscribeReceived(this,
+                    new MqttMsgUnsubscribeEventArgs(messageId, topics));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising CONNECT message event
+        /// </summary>
+        private void OnMqttMsgConnected(MqttMsgConnect connect)
+        {
+            if (this.MqttMsgConnected != null)
+            {
+                this.ProtocolVersion = (MqttProtocolVersion)connect.ProtocolVersion;
+                this.MqttMsgConnected(this, new MqttMsgConnectEventArgs(connect));
+            }
+        }
+
+        /// <summary>
+        /// Wrapper method for raising DISCONNECT message event
+        /// </summary>
+        private void OnMqttMsgDisconnected()
+        {
+            if (this.MqttMsgDisconnected != null)
+            {
+                this.MqttMsgDisconnected(this, EventArgs.Empty);
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Wrapper method for peer/client disconnection
+        /// </summary>
+        private void OnConnectionClosed()
+        {
+            if (this.ConnectionClosed != null)
+            {
+                this.ConnectionClosed(this, EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Send a message
+        /// </summary>
+        /// <param name="msgBytes">Message bytes</param>
+        private void Send(byte[] msgBytes)
+        {
+            try
+            {
+                // send message
+                this.channel.Send(msgBytes);
+
+#if !BROKER
+                // update last message sent ticks
+                this.lastCommTime = Environment.TickCount;
+#endif
+            }
+            catch (Exception e)
+            {
+#if TRACE
+                MqttUtility.Trace.WriteLine(TraceLevel.Error, "Exception occurred: {0}", e.ToString());
+#endif
+
+                throw new MqttCommunicationException(e);
+            }
+        }
+
+        /// <summary>
+        /// Send a message
+        /// </summary>
+        /// <param name="msg">Message</param>
+        private void Send(MqttMsgBase msg)
+        {
+#if TRACE
+            MqttUtility.Trace.WriteLine(TraceLevel.Frame, "SEND {0}", msg);
+#endif
+            this.Send(msg.GetBytes((byte)this.ProtocolVersion));
+        }
+
+        /// <summary>
+        /// Send a message to the broker and wait answer
+        /// </summary>
+        /// <param name="msgBytes">Message bytes</param>
+        /// <returns>MQTT message response</returns>
+        private MqttMsgBase SendReceive(byte[] msgBytes)
+        {
+            return this.SendReceive(msgBytes, MqttSettings.MQTT_DEFAULT_TIMEOUT);
+        }
+
+        /// <summary>
+        /// Send a message to the broker and wait answer
+        /// </summary>
+        /// <param name="msgBytes">Message bytes</param>
+        /// <param name="timeout">Timeout for receiving answer</param>
+        /// <returns>MQTT message response</returns>
+        private MqttMsgBase SendReceive(byte[] msgBytes, int timeout)
+        {
+            // reset handle before sending
+            this.syncEndReceiving.Reset();
+            try
+            {
+                // send message
+                this.channel.Send(msgBytes);
+
+                // update last message sent ticks
+                this.lastCommTime = Environment.TickCount;
+            }
+            catch (Exception e)
+            {
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK || WINDOWS_APP || WINDOWS_PHONE_APP)
+                if (typeof(SocketException) == e.GetType())
+                {
+                    // connection reset by broker
+                    if (((SocketException)e).SocketErrorCode == SocketError.ConnectionReset)
+                        this.IsConnected = false;
+                }
+#endif
+#if TRACE
+                MqttUtility.Trace.WriteLine(TraceLevel.Error, "Exception occurred: {0}", e.ToString());
+#endif
+
+                throw new MqttCommunicationException(e);
+            }
+
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            // wait for answer from broker
+            if (this.syncEndReceiving.WaitOne(timeout, false))
+#else
+            // wait for answer from broker
+            if (this.syncEndReceiving.WaitOne(timeout))
+#endif
+            {
+                // message received without exception
+                if (this.exReceiving == null)
+                    return this.msgReceived;
+                // receiving thread catched exception
+                else
+                    throw this.exReceiving;
+            }
+            else
+            {
+                // throw timeout exception
+                throw new MqttCommunicationException();
+            }
+        }
+
+        /// <summary>
+        /// Send a message to the broker and wait answer
+        /// </summary>
+        /// <param name="msg">Message</param>
+        /// <returns>MQTT message response</returns>
+        private MqttMsgBase SendReceive(MqttMsgBase msg)
+        {
+            return this.SendReceive(msg, MqttSettings.MQTT_DEFAULT_TIMEOUT);
+        }
+
+        /// <summary>
+        /// Send a message to the broker and wait answer
+        /// </summary>
+        /// <param name="msg">Message</param>
+        /// <param name="timeout">Timeout for receiving answer</param>
+        /// <returns>MQTT message response</returns>
+        private MqttMsgBase SendReceive(MqttMsgBase msg, int timeout)
+        {
+#if TRACE
+            MqttUtility.Trace.WriteLine(TraceLevel.Frame, "SEND {0}", msg);
+#endif
+            return this.SendReceive(msg.GetBytes((byte)this.ProtocolVersion), timeout);
+        }
+
+        /// <summary>
+        /// Enqueue a message into the inflight queue
+        /// </summary>
+        /// <param name="msg">Message to enqueue</param>
+        /// <param name="flow">Message flow (publish, acknowledge)</param>
+        /// <returns>Message enqueued or not</returns>
+        private bool EnqueueInflight(MqttMsgBase msg, MqttMsgFlow flow)
+        {
+            // enqueue is needed (or not)
+            bool enqueue = true;
+
+            // if it is a PUBLISH message with QoS Level 2
+            if ((msg.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                (msg.QosLevel == MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE))
+            {
+                lock (this.inflightQueue)
+                {
+                    // if it is a PUBLISH message already received (it is in the inflight queue), the publisher
+                    // re-sent it because it didn't received the PUBREC. In this case, we have to re-send PUBREC
+
+                    // NOTE : I need to find on message id and flow because the broker could be publish/received
+                    //        to/from client and message id could be the same (one tracked by broker and the other by client)
+                    MqttMsgContextFinder msgCtxFinder = new MqttMsgContextFinder(msg.MessageId, MqttMsgFlow.ToAcknowledge);
+                    MqttMsgContext msgCtx = (MqttMsgContext) QueueExtension.Get(this.inflightQueue, msgCtxFinder.Find);
+
+                    // the PUBLISH message is alredy in the inflight queue, we don't need to re-enqueue but we need
+                    // to change state to re-send PUBREC
+                    if (msgCtx != null)
+                    {
+                        msgCtx.State = MqttMsgState.QueuedQos2;
+                        msgCtx.Flow = MqttMsgFlow.ToAcknowledge;
+                        enqueue = false;
+                    }
+                }
+            }
+
+            if (enqueue)
+            {
+                // set a default state
+                MqttMsgState state = MqttMsgState.QueuedQos0;
+
+                // based on QoS level, the messages flow between broker and client changes
+                switch (msg.QosLevel)
+                {
+                    // QoS Level 0
+                    case MqttMsgBase.QOS_LEVEL_AT_MOST_ONCE:
+
+                        state = MqttMsgState.QueuedQos0;
+                        break;
+
+                    // QoS Level 1
+                    case MqttMsgBase.QOS_LEVEL_AT_LEAST_ONCE:
+
+                        state = MqttMsgState.QueuedQos1;
+                        break;
+
+                    // QoS Level 2
+                    case MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE:
+
+                        state = MqttMsgState.QueuedQos2;
+                        break;
+                }
+
+                // [v3.1.1] SUBSCRIBE and UNSUBSCRIBE aren't "officially" QOS = 1
+                //          so QueuedQos1 state isn't valid for them
+                if (msg.Type == MqttMsgBase.MQTT_MSG_SUBSCRIBE_TYPE)
+                    state = MqttMsgState.SendSubscribe;
+                else if (msg.Type == MqttMsgBase.MQTT_MSG_UNSUBSCRIBE_TYPE)
+                    state = MqttMsgState.SendUnsubscribe;
+
+                // queue message context
+                MqttMsgContext msgContext = new MqttMsgContext()
+                {
+                    Message = msg,
+                    State = state,
+                    Flow = flow,
+                    Attempt = 0
+                };
+
+                lock (this.inflightQueue)
+                {
+                    // check number of messages inside inflight queue 
+                    enqueue = (this.inflightQueue.Count < this.settings.InflightQueueSize);
+
+                    if (enqueue)
+                    {
+                        // enqueue message and unlock send thread
+                        this.inflightQueue.Enqueue(msgContext);
+
+#if TRACE
+                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "enqueued {0}", msg);
+#endif
+
+                        // PUBLISH message
+                        if (msg.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE)
+                        {
+                            // to publish and QoS level 1 or 2
+                            if ((msgContext.Flow == MqttMsgFlow.ToPublish) &&
+                                ((msg.QosLevel == MqttMsgBase.QOS_LEVEL_AT_LEAST_ONCE) ||
+                                 (msg.QosLevel == MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE)))
+                            {
+                                if (this.session != null)
+                                    this.session.InflightMessages.Add(msgContext.Key, msgContext);
+                            }
+                            // to acknowledge and QoS level 2
+                            else if ((msgContext.Flow == MqttMsgFlow.ToAcknowledge) &&
+                                     (msg.QosLevel == MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE))
+                            {
+                                if (this.session != null)
+                                    this.session.InflightMessages.Add(msgContext.Key, msgContext);
+                            }
+                        }
+                    }
+                }
+            }
+
+            this.inflightWaitHandle.Set();
+
+            return enqueue;
+        }
+
+        /// <summary>
+        /// Enqueue a message into the internal queue
+        /// </summary>
+        /// <param name="msg">Message to enqueue</param>
+        private void EnqueueInternal(MqttMsgBase msg)
+        {
+            // enqueue is needed (or not)
+            bool enqueue = true;
+
+            // if it is a PUBREL message (for QoS Level 2)
+            if (msg.Type == MqttMsgBase.MQTT_MSG_PUBREL_TYPE)
+            {
+                lock (this.inflightQueue)
+                {
+                    // if it is a PUBREL but the corresponding PUBLISH isn't in the inflight queue,
+                    // it means that we processed PUBLISH message and received PUBREL and we sent PUBCOMP
+                    // but publisher didn't receive PUBCOMP so it re-sent PUBREL. We need only to re-send PUBCOMP.
+
+                    // NOTE : I need to find on message id and flow because the broker could be publish/received
+                    //        to/from client and message id could be the same (one tracked by broker and the other by client)
+                    MqttMsgContextFinder msgCtxFinder = new MqttMsgContextFinder(msg.MessageId, MqttMsgFlow.ToAcknowledge);
+                    MqttMsgContext msgCtx = (MqttMsgContext) QueueExtension.Get(this.inflightQueue,msgCtxFinder.Find);
+
+                    // the PUBLISH message isn't in the inflight queue, it was already processed so
+                    // we need to re-send PUBCOMP only
+                    if (msgCtx == null)
+                    {
+                        MqttMsgPubcomp pubcomp = new MqttMsgPubcomp();
+                        pubcomp.MessageId = msg.MessageId;
+
+                        this.Send(pubcomp);
+
+                        enqueue = false;
+                    }
+                }
+            }
+            // if it is a PUBCOMP message (for QoS Level 2)
+            else if (msg.Type == MqttMsgBase.MQTT_MSG_PUBCOMP_TYPE)
+            {
+                lock (this.inflightQueue)
+                {
+                    // if it is a PUBCOMP but the corresponding PUBLISH isn't in the inflight queue,
+                    // it means that we sent PUBLISH message, sent PUBREL (after receiving PUBREC) and already received PUBCOMP
+                    // but publisher didn't receive PUBREL so it re-sent PUBCOMP. We need only to ignore this PUBCOMP.
+
+                    // NOTE : I need to find on message id and flow because the broker could be publish/received
+                    //        to/from client and message id could be the same (one tracked by broker and the other by client)
+                    MqttMsgContextFinder msgCtxFinder = new MqttMsgContextFinder(msg.MessageId, MqttMsgFlow.ToPublish);
+                    MqttMsgContext msgCtx = (MqttMsgContext) QueueExtension.Get(this.inflightQueue, msgCtxFinder.Find);
+
+                    // the PUBLISH message isn't in the inflight queue, it was already sent so we need to ignore this PUBCOMP
+                    if (msgCtx == null)
+                    {
+                        enqueue = false;
+                    }
+                }
+            }
+            // if it is a PUBREC message (for QoS Level 2)
+            else if (msg.Type == MqttMsgBase.MQTT_MSG_PUBREC_TYPE)
+            {
+                lock (this.inflightQueue)
+                {
+                    // if it is a PUBREC but the corresponding PUBLISH isn't in the inflight queue,
+                    // it means that we sent PUBLISH message more times (retries) but broker didn't send PUBREC in time
+                    // the publish is failed and we need only to ignore this PUBREC.
+
+                    // NOTE : I need to find on message id and flow because the broker could be publish/received
+                    //        to/from client and message id could be the same (one tracked by broker and the other by client)
+                    MqttMsgContextFinder msgCtxFinder = new MqttMsgContextFinder(msg.MessageId, MqttMsgFlow.ToPublish);
+                    MqttMsgContext msgCtx = (MqttMsgContext) QueueExtension.Get(this.inflightQueue, msgCtxFinder.Find);
+
+                    // the PUBLISH message isn't in the inflight queue, it was already sent so we need to ignore this PUBREC
+                    if (msgCtx == null)
+                    {
+                        enqueue = false;
+                    }
+                }
+            }
+
+            if (enqueue)
+            {
+                lock (this.internalQueue)
+                {
+                    this.internalQueue.Enqueue(msg);
+#if TRACE
+                    MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "enqueued {0}", msg);
+#endif
+                    this.inflightWaitHandle.Set();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Thread for receiving messages
+        /// </summary>
+        private void ReceiveThread()
+        {
+            int readBytes = 0;
+            byte[] fixedHeaderFirstByte = new byte[1];
+            byte msgType;
+
+            while (this.isRunning)
+            {
+                try
+                {
+                    // read first byte (fixed header)
+                    readBytes = this.channel.Receive(fixedHeaderFirstByte);
+
+                    if (readBytes > 0)
+                    {
+#if BROKER
+                        // update last message received ticks
+                        this.lastCommTime = Environment.TickCount;
+#endif
+
+                        // extract message type from received byte
+                        msgType = (byte)((fixedHeaderFirstByte[0] & MqttMsgBase.MSG_TYPE_MASK) >> MqttMsgBase.MSG_TYPE_OFFSET);
+
+                        switch (msgType)
+                        {
+                            // CONNECT message received
+                            case MqttMsgBase.MQTT_MSG_CONNECT_TYPE:
+
+#if BROKER
+                                MqttMsgConnect connect = MqttMsgConnect.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                Trace.WriteLine(TraceLevel.Frame, "RECV {0}", connect);
+#endif
+
+                                // raise message received event
+                                this.OnInternalEvent(new MsgInternalEvent(connect));
+                                break;
+#else
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+                                
+                            // CONNACK message received
+                            case MqttMsgBase.MQTT_MSG_CONNACK_TYPE:
+
+#if BROKER
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#else
+                                this.msgReceived = MqttMsgConnack.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", this.msgReceived);
+#endif
+                                this.syncEndReceiving.Set();
+                                break;
+#endif
+
+                            // PINGREQ message received
+                            case MqttMsgBase.MQTT_MSG_PINGREQ_TYPE:
+
+#if BROKER
+                                this.msgReceived = MqttMsgPingReq.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                Trace.WriteLine(TraceLevel.Frame, "RECV {0}", this.msgReceived);
+#endif
+
+                                MqttMsgPingResp pingresp = new MqttMsgPingResp();
+                                this.Send(pingresp);
+
+                                break;
+#else
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                            // PINGRESP message received
+                            case MqttMsgBase.MQTT_MSG_PINGRESP_TYPE:
+
+#if BROKER
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#else
+                                this.msgReceived = MqttMsgPingResp.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", this.msgReceived);
+#endif
+                                this.syncEndReceiving.Set();
+                                break;
+#endif
+
+                            // SUBSCRIBE message received
+                            case MqttMsgBase.MQTT_MSG_SUBSCRIBE_TYPE:
+
+#if BROKER
+                                MqttMsgSubscribe subscribe = MqttMsgSubscribe.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                Trace.WriteLine(TraceLevel.Frame, "RECV {0}", subscribe);
+#endif
+
+                                // raise message received event
+                                this.OnInternalEvent(new MsgInternalEvent(subscribe));
+
+                                break;
+#else
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                            // SUBACK message received
+                            case MqttMsgBase.MQTT_MSG_SUBACK_TYPE:
+
+#if BROKER
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#else
+                                // enqueue SUBACK message received (for QoS Level 1) into the internal queue
+                                MqttMsgSuback suback = MqttMsgSuback.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", suback);
+#endif
+
+                                // enqueue SUBACK message into the internal queue
+                                this.EnqueueInternal(suback);
+
+                                break;
+#endif
+
+                            // PUBLISH message received
+                            case MqttMsgBase.MQTT_MSG_PUBLISH_TYPE:
+
+                                MqttMsgPublish publish = MqttMsgPublish.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", publish);
+#endif
+
+                                // enqueue PUBLISH message to acknowledge into the inflight queue
+                                this.EnqueueInflight(publish, MqttMsgFlow.ToAcknowledge);
+
+                                break;
+
+                            // PUBACK message received
+                            case MqttMsgBase.MQTT_MSG_PUBACK_TYPE:
+
+                                // enqueue PUBACK message received (for QoS Level 1) into the internal queue
+                                MqttMsgPuback puback = MqttMsgPuback.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", puback);
+#endif
+
+                                // enqueue PUBACK message into the internal queue
+                                this.EnqueueInternal(puback);
+
+                                break;
+
+                            // PUBREC message received
+                            case MqttMsgBase.MQTT_MSG_PUBREC_TYPE:
+
+                                // enqueue PUBREC message received (for QoS Level 2) into the internal queue
+                                MqttMsgPubrec pubrec = MqttMsgPubrec.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", pubrec);
+#endif
+
+                                // enqueue PUBREC message into the internal queue
+                                this.EnqueueInternal(pubrec);
+
+                                break;
+
+                            // PUBREL message received
+                            case MqttMsgBase.MQTT_MSG_PUBREL_TYPE:
+
+                                // enqueue PUBREL message received (for QoS Level 2) into the internal queue
+                                MqttMsgPubrel pubrel = MqttMsgPubrel.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", pubrel);
+#endif
+
+                                // enqueue PUBREL message into the internal queue
+                                this.EnqueueInternal(pubrel);
+
+                                break;
+                                
+                            // PUBCOMP message received
+                            case MqttMsgBase.MQTT_MSG_PUBCOMP_TYPE:
+
+                                // enqueue PUBCOMP message received (for QoS Level 2) into the internal queue
+                                MqttMsgPubcomp pubcomp = MqttMsgPubcomp.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", pubcomp);
+#endif
+
+                                // enqueue PUBCOMP message into the internal queue
+                                this.EnqueueInternal(pubcomp);
+
+                                break;
+
+                            // UNSUBSCRIBE message received
+                            case MqttMsgBase.MQTT_MSG_UNSUBSCRIBE_TYPE:
+
+#if BROKER
+                                MqttMsgUnsubscribe unsubscribe = MqttMsgUnsubscribe.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                Trace.WriteLine(TraceLevel.Frame, "RECV {0}", unsubscribe);
+#endif
+
+                                // raise message received event
+                                this.OnInternalEvent(new MsgInternalEvent(unsubscribe));
+
+                                break;
+#else
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                            // UNSUBACK message received
+                            case MqttMsgBase.MQTT_MSG_UNSUBACK_TYPE:
+
+#if BROKER
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#else
+                                // enqueue UNSUBACK message received (for QoS Level 1) into the internal queue
+                                MqttMsgUnsuback unsuback = MqttMsgUnsuback.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Frame, "RECV {0}", unsuback);
+#endif
+
+                                // enqueue UNSUBACK message into the internal queue
+                                this.EnqueueInternal(unsuback);
+
+                                break;
+#endif
+
+                            // DISCONNECT message received
+                            case MqttMsgDisconnect.MQTT_MSG_DISCONNECT_TYPE:
+
+#if BROKER
+                                MqttMsgDisconnect disconnect = MqttMsgDisconnect.Parse(fixedHeaderFirstByte[0], (byte)this.ProtocolVersion, this.channel);
+#if TRACE
+                                Trace.WriteLine(TraceLevel.Frame, "RECV {0}", disconnect);
+#endif
+
+                                // raise message received event
+                                this.OnInternalEvent(new MsgInternalEvent(disconnect));
+
+                                break;
+#else
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                            default:
+
+                                throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+                        }
+
+                        this.exReceiving = null;
+                    }
+                    // zero bytes read, peer gracefully closed socket
+                    else
+                    {
+                        // wake up thread that will notify connection is closing
+                        this.OnConnectionClosing();
+                    }
+                }
+                catch (Exception e)
+                {
+#if TRACE
+                    MqttUtility.Trace.WriteLine(TraceLevel.Error, "Exception occurred: {0}", e.ToString());
+#endif
+                    this.exReceiving = new MqttCommunicationException(e);
+
+                    bool close = false;
+                    if (e.GetType() == typeof(MqttClientException))
+                    {
+                        // [v3.1.1] scenarios the receiver MUST close the network connection
+                        MqttClientException ex = e as MqttClientException;
+                        close = ((ex.ErrorCode == MqttClientErrorCode.InvalidFlagBits) || 
+                                (ex.ErrorCode == MqttClientErrorCode.InvalidProtocolName) ||
+                                (ex.ErrorCode == MqttClientErrorCode.InvalidConnectFlags));
+                    }
+#if !(WINDOWS_APP || WINDOWS_PHONE_APP)
+                    else if ((e.GetType() == typeof(IOException)) || (e.GetType() == typeof(SocketException)) ||
+                             ((e.InnerException != null) && (e.InnerException.GetType() == typeof(SocketException)))) // added for SSL/TLS incoming connection that use SslStream that wraps SocketException
+                    {
+                        close = true;
+                    }
+#endif
+                    
+                    if (close)
+                    {
+                        // wake up thread that will notify connection is closing
+                        this.OnConnectionClosing();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Thread for handling keep alive message
+        /// </summary>
+        private void KeepAliveThread()
+        {
+            int delta = 0;
+            int wait = this.keepAlivePeriod;
+            
+            // create event to signal that current thread is end
+            this.keepAliveEventEnd = new AutoResetEvent(false);
+
+            while (this.isRunning)
+            {
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                // waiting...
+                this.keepAliveEvent.WaitOne(wait, false);
+#else
+                // waiting...
+                this.keepAliveEvent.WaitOne(wait);
+#endif
+
+                if (this.isRunning)
+                {
+                    delta = Environment.TickCount - this.lastCommTime;
+
+                    // if timeout exceeded ...
+                    if (delta >= this.keepAlivePeriod)
+                    {
+#if BROKER
+                        // client must close connection
+                        this.OnConnectionClosing();
+#else
+                        // ... send keep alive
+            this.Ping();
+            wait = this.keepAlivePeriod;
+#endif
+                    }
+                    else
+                    {
+                        // update waiting time
+                        wait = this.keepAlivePeriod - delta;
+                    }
+                }
+            }
+
+            // signal thread end
+            this.keepAliveEventEnd.Set();
+        }
+
+        /// <summary>
+        /// Thread for raising event
+        /// </summary>
+        private void DispatchEventThread()
+        {
+            while (this.isRunning)
+            {
+#if BROKER
+                if ((this.eventQueue.Count == 0) && !this.isConnectionClosing)
+                {
+                    // broker need to receive the first message (CONNECT)
+                    // within a reasonable amount of time after TCP/IP connection
+                    if (!this.IsConnected)
+                    {
+                        // wait on receiving message from client with a connection timeout
+                        if (!this.receiveEventWaitHandle.WaitOne(this.settings.TimeoutOnConnection))
+                        {
+                            // client must close connection
+                            this.Close();
+
+                            // client raw disconnection
+                            this.OnConnectionClosed();
+                        }
+                    }
+                    else
+                    {
+                        // wait on receiving message from client
+                        this.receiveEventWaitHandle.WaitOne();
+                    }
+                }
+#else
+                if ((this.eventQueue.Count == 0) && !this.isConnectionClosing)
+                    // wait on receiving message from client
+                    this.receiveEventWaitHandle.WaitOne();
+#endif
+
+                // check if it is running or we are closing client
+                if (this.isRunning)
+                {
+                    // get event from queue
+                    InternalEvent internalEvent = null;
+                    lock (this.eventQueue)
+                    {
+                        if (this.eventQueue.Count > 0)
+                            internalEvent = (InternalEvent)this.eventQueue.Dequeue();
+                    }
+
+                    // it's an event with a message inside
+                    if (internalEvent != null)
+                    {
+                        MqttMsgBase msg = ((MsgInternalEvent)internalEvent).Message;
+
+                        if (msg != null)
+                        {
+                            switch (msg.Type)
+                            {
+                                // CONNECT message received
+                                case MqttMsgBase.MQTT_MSG_CONNECT_TYPE:
+
+#if BROKER
+                                    // raise connected client event (CONNECT message received)
+                                    this.OnMqttMsgConnected((MqttMsgConnect)msg);
+                                    break;
+#else
+                                    throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                                // SUBSCRIBE message received
+                                case MqttMsgBase.MQTT_MSG_SUBSCRIBE_TYPE:
+
+#if BROKER
+                                    MqttMsgSubscribe subscribe = (MqttMsgSubscribe)msg;
+                                    // raise subscribe topic event (SUBSCRIBE message received)
+                                    this.OnMqttMsgSubscribeReceived(subscribe.MessageId, subscribe.Topics, subscribe.QoSLevels);
+                                    break;
+#else
+                                    throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                                // SUBACK message received
+                                case MqttMsgBase.MQTT_MSG_SUBACK_TYPE:
+
+                                    // raise subscribed topic event (SUBACK message received)
+                                    this.OnMqttMsgSubscribed((MqttMsgSuback)msg);
+                                    break;
+
+                                // PUBLISH message received
+                                case MqttMsgBase.MQTT_MSG_PUBLISH_TYPE:
+
+                                    // PUBLISH message received in a published internal event, no publish succeeded
+                                    if (internalEvent.GetType() == typeof(MsgPublishedInternalEvent))
+                                        this.OnMqttMsgPublished(msg.MessageId, false);
+                                    else
+                                        // raise PUBLISH message received event 
+                                        this.OnMqttMsgPublishReceived((MqttMsgPublish)msg);
+                                    break;
+
+                                // PUBACK message received
+                                case MqttMsgBase.MQTT_MSG_PUBACK_TYPE:
+
+                                    // raise published message event
+                                    // (PUBACK received for QoS Level 1)
+                                    this.OnMqttMsgPublished(msg.MessageId, true);
+                                    break;
+
+                                // PUBREL message received
+                                case MqttMsgBase.MQTT_MSG_PUBREL_TYPE:
+
+                                    // raise message received event 
+                                    // (PUBREL received for QoS Level 2)
+                                    this.OnMqttMsgPublishReceived((MqttMsgPublish)msg);
+                                    break;
+
+                                // PUBCOMP message received
+                                case MqttMsgBase.MQTT_MSG_PUBCOMP_TYPE:
+
+                                    // raise published message event
+                                    // (PUBCOMP received for QoS Level 2)
+                                    this.OnMqttMsgPublished(msg.MessageId, true);
+                                    break;
+
+                                // UNSUBSCRIBE message received from client
+                                case MqttMsgBase.MQTT_MSG_UNSUBSCRIBE_TYPE:
+
+#if BROKER
+                                    MqttMsgUnsubscribe unsubscribe = (MqttMsgUnsubscribe)msg;
+                                    // raise unsubscribe topic event (UNSUBSCRIBE message received)
+                                    this.OnMqttMsgUnsubscribeReceived(unsubscribe.MessageId, unsubscribe.Topics);
+                                    break;
+#else
+                                    throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+
+                                // UNSUBACK message received
+                                case MqttMsgBase.MQTT_MSG_UNSUBACK_TYPE:
+
+                                    // raise unsubscribed topic event
+                                    this.OnMqttMsgUnsubscribed(msg.MessageId);
+                                    break;
+
+                                // DISCONNECT message received from client
+                                case MqttMsgDisconnect.MQTT_MSG_DISCONNECT_TYPE:
+
+#if BROKER
+                                    // raise disconnected client event (DISCONNECT message received)
+                                    this.OnMqttMsgDisconnected();
+                                    break;
+#else
+                                    throw new MqttClientException(MqttClientErrorCode.WrongBrokerMessage);
+#endif
+                            }
+                        }
+                    }
+                    
+                    // all events for received messages dispatched, check if there is closing connection
+                    if ((this.eventQueue.Count == 0) && this.isConnectionClosing)
+                    {
+                        // client must close connection
+                        this.Close();
+
+                        // client raw disconnection
+                        this.OnConnectionClosed();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Process inflight messages queue
+        /// </summary>
+        private void ProcessInflightThread()
+        {
+            MqttMsgContext msgContext = null;
+            MqttMsgBase msgInflight = null;
+            MqttMsgBase msgReceived = null;
+            InternalEvent internalEvent = null;
+            bool acknowledge = false;
+            int timeout = Timeout.Infinite;
+            int delta;
+            bool msgReceivedProcessed = false;
+
+            try
+            {
+                while (this.isRunning)
+                {
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                    // wait on message queueud to inflight
+                    this.inflightWaitHandle.WaitOne(timeout, false);
+#else
+                    // wait on message queueud to inflight
+                    this.inflightWaitHandle.WaitOne(timeout);
+#endif
+
+                    // it could be unblocked because Close() method is joining
+                    if (this.isRunning)
+                    {
+                        lock (this.inflightQueue)
+                        {
+                            // message received and peeked from internal queue is processed
+                            // NOTE : it has the corresponding message in inflight queue based on messageId
+                            //        (ex. a PUBREC for a PUBLISH, a SUBACK for a SUBSCRIBE, ...)
+                            //        if it's orphan we need to remove from internal queue
+                            msgReceivedProcessed = false;
+                            acknowledge = false;
+                            msgReceived = null;
+
+                            // set timeout tu MaxValue instead of Infinte (-1) to perform
+                            // compare with calcultad current msgTimeout
+                            timeout = Int32.MaxValue;
+
+                            // a message inflight could be re-enqueued but we have to
+                            // analyze it only just one time for cycle
+                            int count = this.inflightQueue.Count;
+                            // process all inflight queued messages
+                            while (count > 0)
+                            {
+                                count--;
+                                acknowledge = false;
+                                msgReceived = null;
+
+                                // check to be sure that client isn't closing and all queues are now empty !
+                                if (!this.isRunning)
+                                    break;
+
+                                // dequeue message context from queue
+                                msgContext = (MqttMsgContext)this.inflightQueue.Dequeue();
+
+                                // get inflight message
+                                msgInflight = (MqttMsgBase)msgContext.Message;
+
+                                switch (msgContext.State)
+                                {
+                                    case MqttMsgState.QueuedQos0:
+
+                                        // QoS 0, PUBLISH message to send to broker, no state change, no acknowledge
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            this.Send(msgInflight);
+                                        }
+                                        // QoS 0, no need acknowledge
+                                        else if (msgContext.Flow == MqttMsgFlow.ToAcknowledge)
+                                        {
+                                            internalEvent = new MsgInternalEvent(msgInflight);
+                                            // notify published message from broker (no need acknowledged)
+                                            this.OnInternalEvent(internalEvent);
+                                        }
+
+#if TRACE
+                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "processed {0}", msgInflight);
+#endif
+                                        break;
+
+                                    case MqttMsgState.QueuedQos1:
+                                    // [v3.1.1] SUBSCRIBE and UNSIBSCRIBE aren't "officially" QOS = 1
+                                    case MqttMsgState.SendSubscribe:
+                                    case MqttMsgState.SendUnsubscribe:
+
+                                        // QoS 1, PUBLISH or SUBSCRIBE/UNSUBSCRIBE message to send to broker, state change to wait PUBACK or SUBACK/UNSUBACK
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            msgContext.Timestamp = Environment.TickCount;
+                                            msgContext.Attempt++;
+
+                                            if (msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE)
+                                            {
+                                                // PUBLISH message to send, wait for PUBACK
+                                                msgContext.State = MqttMsgState.WaitForPuback;
+                                                // retry ? set dup flag [v3.1.1] only for PUBLISH message
+                                                if (msgContext.Attempt > 1)
+                                                    msgInflight.DupFlag = true;
+                                            }
+                                            else if (msgInflight.Type == MqttMsgBase.MQTT_MSG_SUBSCRIBE_TYPE)
+                                                // SUBSCRIBE message to send, wait for SUBACK
+                                                msgContext.State = MqttMsgState.WaitForSuback;
+                                            else if (msgInflight.Type == MqttMsgBase.MQTT_MSG_UNSUBSCRIBE_TYPE)
+                                                // UNSUBSCRIBE message to send, wait for UNSUBACK
+                                                msgContext.State = MqttMsgState.WaitForUnsuback;
+
+                                            this.Send(msgInflight);
+
+                                            // update timeout : minimum between delay (based on current message sent) or current timeout
+                                            timeout = (this.settings.DelayOnRetry < timeout) ? this.settings.DelayOnRetry : timeout;
+
+                                            // re-enqueue message (I have to re-analyze for receiving PUBACK, SUBACK or UNSUBACK)
+                                            this.inflightQueue.Enqueue(msgContext);
+                                        }
+                                        // QoS 1, PUBLISH message received from broker to acknowledge, send PUBACK
+                                        else if (msgContext.Flow == MqttMsgFlow.ToAcknowledge)
+                                        {
+                                            MqttMsgPuback puback = new MqttMsgPuback();
+                                            puback.MessageId = msgInflight.MessageId;
+
+                                            this.Send(puback);
+
+                                            internalEvent = new MsgInternalEvent(msgInflight);
+                                            // notify published message from broker and acknowledged
+                                            this.OnInternalEvent(internalEvent);
+
+#if TRACE
+                                            MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "processed {0}", msgInflight);
+#endif
+                                        }
+                                        break;
+
+                                    case MqttMsgState.QueuedQos2:
+
+                                        // QoS 2, PUBLISH message to send to broker, state change to wait PUBREC
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            msgContext.Timestamp = Environment.TickCount;
+                                            msgContext.Attempt++;
+                                            msgContext.State = MqttMsgState.WaitForPubrec;
+                                            // retry ? set dup flag
+                                            if (msgContext.Attempt > 1)
+                                                msgInflight.DupFlag = true;
+
+                                            this.Send(msgInflight);
+
+                                            // update timeout : minimum between delay (based on current message sent) or current timeout
+                                            timeout = (this.settings.DelayOnRetry < timeout) ? this.settings.DelayOnRetry : timeout;
+
+                                            // re-enqueue message (I have to re-analyze for receiving PUBREC)
+                                            this.inflightQueue.Enqueue(msgContext);
+                                        }
+                                        // QoS 2, PUBLISH message received from broker to acknowledge, send PUBREC, state change to wait PUBREL
+                                        else if (msgContext.Flow == MqttMsgFlow.ToAcknowledge)
+                                        {
+                                            MqttMsgPubrec pubrec = new MqttMsgPubrec();
+                                            pubrec.MessageId = msgInflight.MessageId;
+
+                                            msgContext.State = MqttMsgState.WaitForPubrel;
+
+                                            this.Send(pubrec);
+
+                                            // re-enqueue message (I have to re-analyze for receiving PUBREL)
+                                            this.inflightQueue.Enqueue(msgContext);
+                                        }
+                                        break;
+
+                                    case MqttMsgState.WaitForPuback:
+                                    case MqttMsgState.WaitForSuback:
+                                    case MqttMsgState.WaitForUnsuback:
+
+                                        // QoS 1, waiting for PUBACK of a PUBLISH message sent or
+                                        //        waiting for SUBACK of a SUBSCRIBE message sent or
+                                        //        waiting for UNSUBACK of a UNSUBSCRIBE message sent or
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            acknowledge = false;
+                                            lock (this.internalQueue)
+                                            {
+                                                if (this.internalQueue.Count > 0)
+                                                    msgReceived = (MqttMsgBase)this.internalQueue.Peek();
+                                            }
+
+                                            // it is a PUBACK message or a SUBACK/UNSUBACK message
+                                            if (msgReceived != null)
+                                            {
+                                                // PUBACK message or SUBACK/UNSUBACK message for the current message
+                                                if (((msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBACK_TYPE) && (msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) && (msgReceived.MessageId == msgInflight.MessageId)) ||
+                                                    ((msgReceived.Type == MqttMsgBase.MQTT_MSG_SUBACK_TYPE) && (msgInflight.Type == MqttMsgBase.MQTT_MSG_SUBSCRIBE_TYPE) && (msgReceived.MessageId == msgInflight.MessageId)) ||
+                                                    ((msgReceived.Type == MqttMsgBase.MQTT_MSG_UNSUBACK_TYPE) && (msgInflight.Type == MqttMsgBase.MQTT_MSG_UNSUBSCRIBE_TYPE) && (msgReceived.MessageId == msgInflight.MessageId)))
+                                                {
+                                                    lock (this.internalQueue)
+                                                    {
+                                                        // received message processed
+                                                        this.internalQueue.Dequeue();
+                                                        acknowledge = true;
+                                                        msgReceivedProcessed = true;
+#if TRACE
+                                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0}", msgReceived);
+#endif
+                                                    }
+
+                                                    // if PUBACK received, confirm published with flag
+                                                    if (msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBACK_TYPE)
+                                                        internalEvent = new MsgPublishedInternalEvent(msgReceived, true);
+                                                    else
+                                                        internalEvent = new MsgInternalEvent(msgReceived);
+
+                                                    // notify received acknowledge from broker of a published message or subscribe/unsubscribe message
+                                                    this.OnInternalEvent(internalEvent);
+
+                                                    // PUBACK received for PUBLISH message with QoS Level 1, remove from session state
+                                                    if ((msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                                                        (this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                        (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                        (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                    {
+                                                        this.session.InflightMessages.Remove(msgContext.Key);
+                                                    }
+
+#if TRACE
+                                                    MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "processed {0}", msgInflight);
+#endif
+                                                }
+                                            }
+
+                                            // current message not acknowledged, no PUBACK or SUBACK/UNSUBACK or not equal messageid 
+                                            if (!acknowledge)
+                                            {
+                                                delta = Environment.TickCount - msgContext.Timestamp;
+                                                // check timeout for receiving PUBACK since PUBLISH was sent or
+                                                // for receiving SUBACK since SUBSCRIBE was sent or
+                                                // for receiving UNSUBACK since UNSUBSCRIBE was sent
+                                                if (delta >= this.settings.DelayOnRetry)
+                                                {
+                                                    // max retry not reached, resend
+                                                    if (msgContext.Attempt < this.settings.AttemptsOnRetry)
+                                                    {
+                                                        msgContext.State = MqttMsgState.QueuedQos1;
+
+                                                        // re-enqueue message
+                                                        this.inflightQueue.Enqueue(msgContext);
+
+                                                        // update timeout (0 -> reanalyze queue immediately)
+                                                        timeout = 0;
+                                                    }
+                                                    else
+                                                    {
+                                                        // if PUBACK for a PUBLISH message not received after retries, raise event for not published
+                                                        if (msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE)
+                                                        {
+                                                            // PUBACK not received in time, PUBLISH retries failed, need to remove from session inflight messages too
+                                                            if ((this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                                (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                                (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                            {
+                                                                this.session.InflightMessages.Remove(msgContext.Key);
+                                                            }
+
+                                                            internalEvent = new MsgPublishedInternalEvent(msgInflight, false);
+
+                                                            // notify not received acknowledge from broker and message not published
+                                                            this.OnInternalEvent(internalEvent);
+                                                        }
+                                                        // NOTE : not raise events for SUBACK or UNSUBACK not received
+                                                        //        for the user no event raised means subscribe/unsubscribe failed
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    // re-enqueue message (I have to re-analyze for receiving PUBACK, SUBACK or UNSUBACK)
+                                                    this.inflightQueue.Enqueue(msgContext);
+
+                                                    // update timeout
+                                                    int msgTimeout = (this.settings.DelayOnRetry - delta);
+                                                    timeout = (msgTimeout < timeout) ? msgTimeout : timeout;
+                                                }
+                                            }
+                                        }
+                                        break;
+
+                                    case MqttMsgState.WaitForPubrec:
+
+                                        // QoS 2, waiting for PUBREC of a PUBLISH message sent
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            acknowledge = false;
+                                            lock (this.internalQueue)
+                                            {
+                                                if (this.internalQueue.Count > 0)
+                                                    msgReceived = (MqttMsgBase)this.internalQueue.Peek();
+                                            }
+
+                                            // it is a PUBREC message
+                                            if ((msgReceived != null) && (msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBREC_TYPE))
+                                            {
+                                                // PUBREC message for the current PUBLISH message, send PUBREL, wait for PUBCOMP
+                                                if (msgReceived.MessageId == msgInflight.MessageId)
+                                                {
+                                                    lock (this.internalQueue)
+                                                    {
+                                                        // received message processed
+                                                        this.internalQueue.Dequeue();
+                                                        acknowledge = true;
+                                                        msgReceivedProcessed = true;
+#if TRACE
+                                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0}", msgReceived);
+#endif
+                                                    }
+
+                                                    MqttMsgPubrel pubrel = new MqttMsgPubrel();
+                                                    pubrel.MessageId = msgInflight.MessageId;
+
+                                                    msgContext.State = MqttMsgState.WaitForPubcomp;
+                                                    msgContext.Timestamp = Environment.TickCount;
+                                                    msgContext.Attempt = 1;
+
+                                                    this.Send(pubrel);
+
+                                                    // update timeout : minimum between delay (based on current message sent) or current timeout
+                                                    timeout = (this.settings.DelayOnRetry < timeout) ? this.settings.DelayOnRetry : timeout;
+
+                                                    // re-enqueue message
+                                                    this.inflightQueue.Enqueue(msgContext);
+                                                }
+                                            }
+
+                                            // current message not acknowledged
+                                            if (!acknowledge)
+                                            {
+                                                delta = Environment.TickCount - msgContext.Timestamp;
+                                                // check timeout for receiving PUBREC since PUBLISH was sent
+                                                if (delta >= this.settings.DelayOnRetry)
+                                                {
+                                                    // max retry not reached, resend
+                                                    if (msgContext.Attempt < this.settings.AttemptsOnRetry)
+                                                    {
+                                                        msgContext.State = MqttMsgState.QueuedQos2;
+
+                                                        // re-enqueue message
+                                                        this.inflightQueue.Enqueue(msgContext);
+
+                                                        // update timeout (0 -> reanalyze queue immediately)
+                                                        timeout = 0;
+                                                    }
+                                                    else
+                                                    {
+                                                        // PUBREC not received in time, PUBLISH retries failed, need to remove from session inflight messages too
+                                                        if ((this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                            (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                            (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                        {
+                                                            this.session.InflightMessages.Remove(msgContext.Key);
+                                                        }
+
+                                                        // if PUBREC for a PUBLISH message not received after retries, raise event for not published
+                                                        internalEvent = new MsgPublishedInternalEvent(msgInflight, false);
+                                                        // notify not received acknowledge from broker and message not published
+                                                        this.OnInternalEvent(internalEvent);
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    // re-enqueue message
+                                                    this.inflightQueue.Enqueue(msgContext);
+
+                                                    // update timeout
+                                                    int msgTimeout = (this.settings.DelayOnRetry - delta);
+                                                    timeout = (msgTimeout < timeout) ? msgTimeout : timeout;
+                                                }
+                                            }
+                                        }
+                                        break;
+
+                                    case MqttMsgState.WaitForPubrel:
+
+                                        // QoS 2, waiting for PUBREL of a PUBREC message sent
+                                        if (msgContext.Flow == MqttMsgFlow.ToAcknowledge)
+                                        {
+                                            lock (this.internalQueue)
+                                            {
+                                                if (this.internalQueue.Count > 0)
+                                                    msgReceived = (MqttMsgBase)this.internalQueue.Peek();
+                                            }
+
+                                            // it is a PUBREL message
+                                            if ((msgReceived != null) && (msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBREL_TYPE))
+                                            {
+                                                // PUBREL message for the current message, send PUBCOMP
+                                                if (msgReceived.MessageId == msgInflight.MessageId)
+                                                {
+                                                    lock (this.internalQueue)
+                                                    {
+                                                        // received message processed
+                                                        this.internalQueue.Dequeue();
+                                                        msgReceivedProcessed = true;
+#if TRACE
+                                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0}", msgReceived);
+#endif
+                                                    }
+
+                                                    MqttMsgPubcomp pubcomp = new MqttMsgPubcomp();
+                                                    pubcomp.MessageId = msgInflight.MessageId;
+
+                                                    this.Send(pubcomp);
+
+                                                    internalEvent = new MsgInternalEvent(msgInflight);
+                                                    // notify published message from broker and acknowledged
+                                                    this.OnInternalEvent(internalEvent);
+
+                                                    // PUBREL received (and PUBCOMP sent) for PUBLISH message with QoS Level 2, remove from session state
+                                                    if ((msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                                                        (this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                        (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                        (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                    {
+                                                        this.session.InflightMessages.Remove(msgContext.Key);
+                                                    }
+
+#if TRACE
+                                                    MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "processed {0}", msgInflight);
+#endif
+                                                }
+                                                else
+                                                {
+                                                    // re-enqueue message
+                                                    this.inflightQueue.Enqueue(msgContext);
+                                                }
+                                            }
+                                            else
+                                            {
+                                                // re-enqueue message
+                                                this.inflightQueue.Enqueue(msgContext);
+                                            }
+                                        }
+                                        break;
+
+                                    case MqttMsgState.WaitForPubcomp:
+
+                                        // QoS 2, waiting for PUBCOMP of a PUBREL message sent
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            acknowledge = false;
+                                            lock (this.internalQueue)
+                                            {
+                                                if (this.internalQueue.Count > 0)
+                                                    msgReceived = (MqttMsgBase)this.internalQueue.Peek();
+                                            }
+
+                                            // it is a PUBCOMP message
+                                            if ((msgReceived != null) && (msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBCOMP_TYPE))
+                                            {
+                                                // PUBCOMP message for the current message
+                                                if (msgReceived.MessageId == msgInflight.MessageId)
+                                                {
+                                                    lock (this.internalQueue)
+                                                    {
+                                                        // received message processed
+                                                        this.internalQueue.Dequeue();
+                                                        acknowledge = true;
+                                                        msgReceivedProcessed = true;
+#if TRACE
+                                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0}", msgReceived);
+#endif
+                                                    }
+
+                                                    internalEvent = new MsgPublishedInternalEvent(msgReceived, true);
+                                                    // notify received acknowledge from broker of a published message
+                                                    this.OnInternalEvent(internalEvent);
+
+                                                    // PUBCOMP received for PUBLISH message with QoS Level 2, remove from session state
+                                                    if ((msgInflight.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                                                        (this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                        (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                        (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                    {
+                                                        this.session.InflightMessages.Remove(msgContext.Key);
+                                                    }
+
+#if TRACE
+                                                    MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "processed {0}", msgInflight);
+#endif
+                                                }
+                                            }
+                                            // it is a PUBREC message
+                                            else if ((msgReceived != null) && (msgReceived.Type == MqttMsgBase.MQTT_MSG_PUBREC_TYPE))
+                                            {
+                                                // another PUBREC message for the current message due to a retransmitted PUBLISH
+                                                // I'm in waiting for PUBCOMP, so I can discard this PUBREC
+                                                if (msgReceived.MessageId == msgInflight.MessageId)
+                                                {
+                                                    lock (this.internalQueue)
+                                                    {
+                                                        // received message processed
+                                                        this.internalQueue.Dequeue();
+                                                        acknowledge = true;
+                                                        msgReceivedProcessed = true;
+#if TRACE
+                                                        MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0}", msgReceived);
+#endif
+
+                                                        // re-enqueue message
+                                                        this.inflightQueue.Enqueue(msgContext);
+                                                    }
+                                                }
+                                            }
+
+                                            // current message not acknowledged
+                                            if (!acknowledge)
+                                            {
+                                                delta = Environment.TickCount - msgContext.Timestamp; 
+                                                // check timeout for receiving PUBCOMP since PUBREL was sent
+                                                if (delta >= this.settings.DelayOnRetry)
+                                                {
+                                                    // max retry not reached, resend
+                                                    if (msgContext.Attempt < this.settings.AttemptsOnRetry)
+                                                    {
+                                                        msgContext.State = MqttMsgState.SendPubrel;
+
+                                                        // re-enqueue message
+                                                        this.inflightQueue.Enqueue(msgContext);
+
+                                                        // update timeout (0 -> reanalyze queue immediately)
+                                                        timeout = 0;
+                                                    }
+                                                    else
+                                                    {
+                                                        // PUBCOMP not received, PUBREL retries failed, need to remove from session inflight messages too
+                                                        if ((this.session != null) &&
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+                                                            (this.session.InflightMessages.Contains(msgContext.Key)))
+#else
+                                                            (this.session.InflightMessages.ContainsKey(msgContext.Key)))
+#endif
+                                                        {
+                                                            this.session.InflightMessages.Remove(msgContext.Key);
+                                                        }
+
+                                                        // if PUBCOMP for a PUBLISH message not received after retries, raise event for not published
+                                                        internalEvent = new MsgPublishedInternalEvent(msgInflight, false);
+                                                        // notify not received acknowledge from broker and message not published
+                                                        this.OnInternalEvent(internalEvent);
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    // re-enqueue message
+                                                    this.inflightQueue.Enqueue(msgContext);
+
+                                                    // update timeout
+                                                    int msgTimeout = (this.settings.DelayOnRetry - delta);
+                                                    timeout = (msgTimeout < timeout) ? msgTimeout : timeout;
+                                                }
+                                            }
+                                        }
+                                        break;
+
+                                    case MqttMsgState.SendPubrec:
+
+                                        // TODO : impossible ? --> QueuedQos2 ToAcknowledge
+                                        break;
+
+                                    case MqttMsgState.SendPubrel:
+
+                                        // QoS 2, PUBREL message to send to broker, state change to wait PUBCOMP
+                                        if (msgContext.Flow == MqttMsgFlow.ToPublish)
+                                        {
+                                            MqttMsgPubrel pubrel = new MqttMsgPubrel();
+                                            pubrel.MessageId = msgInflight.MessageId;
+
+                                            msgContext.State = MqttMsgState.WaitForPubcomp;
+                                            msgContext.Timestamp = Environment.TickCount;
+                                            msgContext.Attempt++;
+                                            // retry ? set dup flag [v3.1.1] no needed
+                                            if (this.ProtocolVersion == MqttProtocolVersion.Version_3_1)
+                                            {
+                                                if (msgContext.Attempt > 1)
+                                                    pubrel.DupFlag = true;
+                                            }
+                                            
+                                            this.Send(pubrel);
+
+                                            // update timeout : minimum between delay (based on current message sent) or current timeout
+                                            timeout = (this.settings.DelayOnRetry < timeout) ? this.settings.DelayOnRetry : timeout;
+
+                                            // re-enqueue message
+                                            this.inflightQueue.Enqueue(msgContext);
+                                        }
+                                        break;
+
+                                    case MqttMsgState.SendPubcomp:
+                                        // TODO : impossible ?
+                                        break;
+                                    case MqttMsgState.SendPuback:
+                                        // TODO : impossible ? --> QueuedQos1 ToAcknowledge
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+
+                            // if calculated timeout is MaxValue, it means that must be Infinite (-1)
+                            if (timeout == Int32.MaxValue)
+                                timeout = Timeout.Infinite;
+
+                            // if message received is orphan, no corresponding message in inflight queue
+                            // based on messageId, we need to remove from the queue
+                            if ((msgReceived != null) && !msgReceivedProcessed)
+                            {
+                                this.internalQueue.Dequeue();
+#if TRACE
+                                MqttUtility.Trace.WriteLine(TraceLevel.Queuing, "dequeued {0} orphan", msgReceived);
+#endif
+                            }
+                        }
+                    }
+                }
+            }
+            catch (MqttCommunicationException e)
+            {
+                // possible exception on Send, I need to re-enqueue not sent message
+                if (msgContext != null)
+                    // re-enqueue message
+                    this.inflightQueue.Enqueue(msgContext);
+
+#if TRACE
+                MqttUtility.Trace.WriteLine(TraceLevel.Error, "Exception occurred: {0}", e.ToString());
+#endif
+
+                // raise disconnection client event
+                this.OnConnectionClosing();
+            }
+        }
+
+        /// <summary>
+        /// Restore session
+        /// </summary>
+        private void RestoreSession()
+        {
+            // if not clean session
+            if (!this.CleanSession)
+            {
+                // there is a previous session
+                if (this.session != null)
+                {
+                    lock (this.inflightQueue)
+                    {
+                        foreach (MqttMsgContext msgContext in this.session.InflightMessages.Values)
+                        {
+                            this.inflightQueue.Enqueue(msgContext);
+
+                            // if it is a PUBLISH message to publish
+                            if ((msgContext.Message.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                                (msgContext.Flow == MqttMsgFlow.ToPublish))
+                            {
+                                // it's QoS 1 and we haven't received PUBACK
+                                if ((msgContext.Message.QosLevel == MqttMsgBase.QOS_LEVEL_AT_LEAST_ONCE) &&
+                                    (msgContext.State == MqttMsgState.WaitForPuback))
+                                {
+                                    // we haven't received PUBACK, we need to resend PUBLISH message
+                                    msgContext.State = MqttMsgState.QueuedQos1;
+                                }
+                                // it's QoS 2
+                                else if (msgContext.Message.QosLevel == MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE)
+                                {
+                                    // we haven't received PUBREC, we need to resend PUBLISH message
+                                    if (msgContext.State == MqttMsgState.WaitForPubrec)
+                                    {
+                                        msgContext.State = MqttMsgState.QueuedQos2;
+                                    }
+                                    // we haven't received PUBCOMP, we need to resend PUBREL for it
+                                    else if (msgContext.State == MqttMsgState.WaitForPubcomp)
+                                    {
+                                        msgContext.State = MqttMsgState.SendPubrel;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    // unlock process inflight queue
+                    this.inflightWaitHandle.Set();
+                }
+                else
+                {
+                    // create new session
+                    this.session = new MqttClientSession(this.ClientId);
+                }
+            }
+            // clean any previous session
+            else
+            {
+                if (this.session != null)
+                    this.session.Clear();
+            }
+        }
+
+#if BROKER
+
+        /// <summary>
+        /// Load a given session
+        /// </summary>
+        /// <param name="session">MQTT Client session to load</param>
+        public void LoadSession(MqttClientSession session)
+        {
+            // if not clean session
+            if (!this.CleanSession)
+            {
+                // set the session ...
+                this.session = session;
+                // ... and restore it
+                this.RestoreSession();
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Generate the next message identifier
+        /// </summary>
+        /// <returns>Message identifier</returns>
+        private ushort GetMessageId()
+        {
+            // if 0 or max UInt16, it becomes 1 (first valid messageId)
+            this.messageIdCounter = ((this.messageIdCounter % UInt16.MaxValue) != 0) ? (ushort)(this.messageIdCounter + 1) : (ushort)1;
+            return this.messageIdCounter;
+        }
+
+        /// <summary>
+        /// Finder class for PUBLISH message inside a queue
+        /// </summary>
+        internal class MqttMsgContextFinder
+        {
+            // PUBLISH message id
+            internal ushort MessageId { get; set; }
+            // message flow into inflight queue
+            internal MqttMsgFlow Flow { get; set; }
+
+            /// <summary>
+            /// Constructor
+            /// </summary>
+            /// <param name="messageId">Message Id</param>
+            /// <param name="flow">Message flow inside inflight queue</param>
+            internal MqttMsgContextFinder(ushort messageId, MqttMsgFlow flow)
+            {
+                this.MessageId = messageId;
+                this.Flow = flow;
+            }
+
+            internal bool Find(object item)
+            {
+                MqttMsgContext msgCtx = (MqttMsgContext)item;
+                return ((msgCtx.Message.Type == MqttMsgBase.MQTT_MSG_PUBLISH_TYPE) &&
+                        (msgCtx.Message.MessageId == this.MessageId) &&
+                        msgCtx.Flow == this.Flow);
+
+            }
+        }
+    }
+
+    /// <summary>
+    /// MQTT protocol version
+    /// </summary>
+    public enum MqttProtocolVersion
+    {
+        Version_3_1 = MqttMsgConnect.PROTOCOL_VERSION_V3_1,
+        Version_3_1_1 = MqttMsgConnect.PROTOCOL_VERSION_V3_1_1
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/MqttSecurity.cs b/Librarys/mqtt/M2Mqtt/MqttSecurity.cs
new file mode 100644
index 0000000..b19f108
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/MqttSecurity.cs
@@ -0,0 +1,30 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Supported SSL/TLS protocol versions
+    /// </summary>
+    public enum MqttSslProtocols
+    {
+        None,
+        SSLv3,
+        TLSv1_0,
+        TLSv1_1,
+        TLSv1_2
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/MqttSettings.cs b/Librarys/mqtt/M2Mqtt/MqttSettings.cs
new file mode 100644
index 0000000..994f622
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/MqttSettings.cs
@@ -0,0 +1,104 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Settings class for the MQTT broker
+    /// </summary>
+    public class MqttSettings
+    {
+        // default port for MQTT protocol
+        public const int MQTT_BROKER_DEFAULT_PORT = 1883;
+        public const int MQTT_BROKER_DEFAULT_SSL_PORT = 8883;
+        // default timeout on receiving from client
+        public const int MQTT_DEFAULT_TIMEOUT = 30000;
+        // max publish, subscribe and unsubscribe retry for QoS Level 1 or 2
+        public const int MQTT_ATTEMPTS_RETRY = 3;
+        // delay for retry publish, subscribe and unsubscribe for QoS Level 1 or 2
+        public const int MQTT_DELAY_RETRY = 10000;
+        // broker need to receive the first message (CONNECT)
+        // within a reasonable amount of time after TCP/IP connection 
+        public const int MQTT_CONNECT_TIMEOUT = 30000;
+        // default inflight queue size
+        public const int MQTT_MAX_INFLIGHT_QUEUE_SIZE = int.MaxValue;
+
+        /// <summary>
+        /// Listening connection port
+        /// </summary>
+        public int Port { get; internal set; }
+
+        /// <summary>
+        /// Listening connection SSL port
+        /// </summary>
+        public int SslPort { get; internal set; }
+
+        /// <summary>
+        /// Timeout on client connection (before receiving CONNECT message)
+        /// </summary>
+        public int TimeoutOnConnection { get; internal set; }
+
+        /// <summary>
+        /// Timeout on receiving
+        /// </summary>
+        public int TimeoutOnReceiving { get; internal set; }
+
+        /// <summary>
+        /// Attempts on retry
+        /// </summary>
+        public int AttemptsOnRetry { get; internal set; }
+
+        /// <summary>
+        /// Delay on retry
+        /// </summary>
+        public int DelayOnRetry { get; internal set; }
+
+        /// <summary>
+        /// Inflight queue size
+        /// </summary>
+        public int InflightQueueSize { get; set; }
+        
+        /// <summary>
+        /// Singleton instance of settings
+        /// </summary>
+        public static MqttSettings Instance
+        {
+            get
+            {
+                if (instance == null)
+                    instance = new MqttSettings();
+                return instance;
+            }
+        }
+
+        // singleton instance
+        private static MqttSettings instance;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        private MqttSettings()
+        {
+            this.Port = MQTT_BROKER_DEFAULT_PORT;
+            this.SslPort = MQTT_BROKER_DEFAULT_SSL_PORT;
+            this.TimeoutOnReceiving = MQTT_DEFAULT_TIMEOUT;
+            this.AttemptsOnRetry = MQTT_ATTEMPTS_RETRY;
+            this.DelayOnRetry = MQTT_DELAY_RETRY;
+            this.TimeoutOnConnection = MQTT_CONNECT_TIMEOUT;
+            this.InflightQueueSize = MQTT_MAX_INFLIGHT_QUEUE_SIZE;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Net/Fx.cs b/Librarys/mqtt/M2Mqtt/Net/Fx.cs
new file mode 100644
index 0000000..3fcc505
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Net/Fx.cs
@@ -0,0 +1,36 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Threading;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Support methods fos specific framework
+    /// </summary>
+    public class Fx
+    {
+        public static void StartThread(ThreadStart threadStart)
+        {
+            new Thread(threadStart).Start();
+        }
+
+        public static void SleepThread(int millisecondsTimeout)
+        {
+            Thread.Sleep(millisecondsTimeout);
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Net/MqttNetworkChannel.cs b/Librarys/mqtt/M2Mqtt/Net/MqttNetworkChannel.cs
new file mode 100644
index 0000000..418364c
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Net/MqttNetworkChannel.cs
@@ -0,0 +1,472 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if SSL
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+using Microsoft.SPOT.Net.Security;
+#else
+using System.Net.Security;
+using System.Security.Authentication;
+#endif
+#endif
+using System.Net.Sockets;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using System;
+using System.Security.Authentication;
+using System.Net.Security;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Channel to communicate over the network
+    /// </summary>
+    public class MqttNetworkChannel : IMqttNetworkChannel
+    {
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+        private readonly RemoteCertificateValidationCallback userCertificateValidationCallback;
+        private readonly LocalCertificateSelectionCallback userCertificateSelectionCallback;
+#endif
+        // remote host information
+        private string remoteHostName;
+        private IPAddress remoteIpAddress;
+        private int remotePort;
+
+        // socket for communication
+        private Socket socket;
+        // using SSL
+        private bool secure;
+
+        // CA certificate (on client)
+        private X509Certificate caCert;
+        // Server certificate (on broker)
+        private X509Certificate serverCert;
+        // client certificate (on client)
+        private X509Certificate clientCert;
+
+        // SSL/TLS protocol version
+        private MqttSslProtocols sslProtocol;
+
+        /// <summary>
+        /// Remote host name
+        /// </summary>
+        public string RemoteHostName { get { return this.remoteHostName; } }
+
+        /// <summary>
+        /// Remote IP address
+        /// </summary>
+        public IPAddress RemoteIpAddress { get { return this.remoteIpAddress; } }
+
+        /// <summary>
+        /// Remote port
+        /// </summary>
+        public int RemotePort { get { return this.remotePort; } }
+
+#if SSL
+        // SSL stream
+        private SslStream sslStream;
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+        private NetworkStream netStream;
+#endif
+#endif
+
+        /// <summary>
+        /// Data available on the channel
+        /// </summary>
+        public bool DataAvailable
+        {
+            get
+            {
+#if SSL
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+                if (secure)
+                    return this.sslStream.DataAvailable;
+                else
+                    return (this.socket.Available > 0);
+#else
+                if (secure)
+                    return this.netStream.DataAvailable;
+                else
+                    return (this.socket.Available > 0);
+#endif
+#else
+                return (this.socket.Available > 0);
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="socket">Socket opened with the client</param>
+        public MqttNetworkChannel(Socket socket)
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            : this(socket, false, null, MqttSslProtocols.None, null, null)
+#else
+            : this(socket, false, null, MqttSslProtocols.None)
+#endif
+        {
+
+        }
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="socket">Socket opened with the client</param>
+        /// <param name="secure">Secure connection (SSL/TLS)</param>
+        /// <param name="serverCert">Server X509 certificate for secure connection</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+        /// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        /// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
+        public MqttNetworkChannel(Socket socket, bool secure, X509Certificate serverCert, MqttSslProtocols sslProtocol,
+            RemoteCertificateValidationCallback userCertificateValidationCallback,
+            LocalCertificateSelectionCallback userCertificateSelectionCallback)
+#else
+        public MqttNetworkChannel(Socket socket, bool secure, X509Certificate serverCert, MqttSslProtocols sslProtocol)
+#endif
+        {
+            this.socket = socket;
+            this.secure = secure;
+            this.serverCert = serverCert;
+            this.sslProtocol = sslProtocol;
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            this.userCertificateValidationCallback = userCertificateValidationCallback;
+            this.userCertificateSelectionCallback = userCertificateSelectionCallback;
+#endif
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="remoteHostName">Remote Host name</param>
+        /// <param name="remotePort">Remote port</param>
+        public MqttNetworkChannel(string remoteHostName, int remotePort)
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            : this(remoteHostName, remotePort, false, null, null, MqttSslProtocols.None, null, null)
+#else
+            : this(remoteHostName, remotePort, false, null, null, MqttSslProtocols.None)
+#endif
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="remoteHostName">Remote Host name</param>
+        /// <param name="remotePort">Remote port</param>
+        /// <param name="secure">Using SSL</param>
+        /// <param name="caCert">CA certificate</param>
+        /// <param name="clientCert">Client certificate</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+        /// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
+        /// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
+        public MqttNetworkChannel(string remoteHostName, int remotePort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
+            RemoteCertificateValidationCallback userCertificateValidationCallback,
+            LocalCertificateSelectionCallback userCertificateSelectionCallback)
+#else
+        public MqttNetworkChannel(string remoteHostName, int remotePort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)
+#endif
+        {
+            IPAddress remoteIpAddress = null;
+            try
+            {
+                // check if remoteHostName is a valid IP address and get it
+                remoteIpAddress = IPAddress.Parse(remoteHostName);
+            }
+            catch
+            {
+            }
+
+            // in this case the parameter remoteHostName isn't a valid IP address
+            if (remoteIpAddress == null)
+            {
+                IPHostEntry hostEntry = Dns.GetHostEntry(remoteHostName);
+                if ((hostEntry != null) && (hostEntry.AddressList.Length > 0))
+                {
+                    // check for the first address not null
+                    // it seems that with .Net Micro Framework, the IPV6 addresses aren't supported and return "null"
+                    int i = 0;
+                    while (hostEntry.AddressList[i] == null) i++;
+                    remoteIpAddress = hostEntry.AddressList[i];
+                }
+                else
+                {
+                    throw new Exception("No address found for the remote host name");
+                }
+            }
+
+            this.remoteHostName = remoteHostName;
+            this.remoteIpAddress = remoteIpAddress;
+            this.remotePort = remotePort;
+            this.secure = secure;
+            this.caCert = caCert;
+            this.clientCert = clientCert;
+            this.sslProtocol = sslProtocol;
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
+            this.userCertificateValidationCallback = userCertificateValidationCallback;
+            this.userCertificateSelectionCallback = userCertificateSelectionCallback;
+#endif
+        }
+
+        /// <summary>
+        /// Connect to remote server
+        /// </summary>
+        public void Connect()
+        {
+            this.socket = new Socket(IPAddressUtility.GetAddressFamily(this.remoteIpAddress), SocketType.Stream, ProtocolType.Tcp);
+            // try connection to the broker
+            this.socket.Connect(new IPEndPoint(this.remoteIpAddress, this.remotePort));
+
+#if SSL
+            // secure channel requested
+            if (secure)
+            {
+                // create SSL stream
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+                this.sslStream = new SslStream(this.socket);
+#else
+                this.netStream = new NetworkStream(this.socket);
+                this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
+#endif
+
+                // server authentication (SSL/TLS handshake)
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+                this.sslStream.AuthenticateAsClient(this.remoteHostName,
+                    this.clientCert,
+                    new X509Certificate[] { this.caCert },
+                    SslVerification.CertificateRequired,
+                    MqttSslUtility.ToSslPlatformEnum(this.sslProtocol));
+#else
+                X509CertificateCollection clientCertificates = null;
+                // check if there is a client certificate to add to the collection, otherwise it's null (as empty)
+                if (this.clientCert != null)
+                    clientCertificates = new X509CertificateCollection(new X509Certificate[] { this.clientCert });
+
+                this.sslStream.AuthenticateAsClient(this.remoteHostName,
+                    clientCertificates,
+                    MqttSslUtility.ToSslPlatformEnum(this.sslProtocol),
+                    false);
+                
+#endif
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Send data on the network channel
+        /// </summary>
+        /// <param name="buffer">Data buffer to send</param>
+        /// <returns>Number of byte sent</returns>
+        public int Send(byte[] buffer)
+        {
+#if SSL
+            if (this.secure)
+            {
+                this.sslStream.Write(buffer, 0, buffer.Length);
+                this.sslStream.Flush();
+                return buffer.Length;
+            }
+            else
+                return this.socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
+#else
+            return this.socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
+#endif
+        }
+
+        /// <summary>
+        /// Receive data from the network
+        /// </summary>
+        /// <param name="buffer">Data buffer for receiving data</param>
+        /// <returns>Number of bytes received</returns>
+        public int Receive(byte[] buffer)
+        {
+#if SSL
+            if (this.secure)
+            {
+                // read all data needed (until fill buffer)
+                int idx = 0, read = 0;
+                while (idx < buffer.Length)
+                {
+                    // fixed scenario with socket closed gracefully by peer/broker and
+                    // Read return 0. Avoid infinite loop.
+                    read = this.sslStream.Read(buffer, idx, buffer.Length - idx);
+                    if (read == 0)
+                        return 0;
+                    idx += read;
+                }
+                return buffer.Length;
+            }
+            else
+            {
+                // read all data needed (until fill buffer)
+                int idx = 0, read = 0;
+                while (idx < buffer.Length)
+                {
+                    // fixed scenario with socket closed gracefully by peer/broker and
+                    // Read return 0. Avoid infinite loop.
+                    read = this.socket.Receive(buffer, idx, buffer.Length - idx, SocketFlags.None);
+                    if (read == 0)
+                        return 0;
+                    idx += read;
+                }
+                return buffer.Length;
+            }
+#else
+            // read all data needed (until fill buffer)
+            int idx = 0, read = 0;
+            while (idx < buffer.Length)
+            {
+                // fixed scenario with socket closed gracefully by peer/broker and
+                // Read return 0. Avoid infinite loop.
+                read = this.socket.Receive(buffer, idx, buffer.Length - idx, SocketFlags.None);
+                if (read == 0)
+                    return 0;
+                idx += read;
+            }
+            return buffer.Length;
+#endif
+        }
+
+        /// <summary>
+        /// Receive data from the network channel with a specified timeout
+        /// </summary>
+        /// <param name="buffer">Data buffer for receiving data</param>
+        /// <param name="timeout">Timeout on receiving (in milliseconds)</param>
+        /// <returns>Number of bytes received</returns>
+        public int Receive(byte[] buffer, int timeout)
+        {
+            // check data availability (timeout is in microseconds)
+            if (this.socket.Poll(timeout * 1000, SelectMode.SelectRead))
+            {
+                return this.Receive(buffer);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Close the network channel
+        /// </summary>
+        public void Close()
+        {
+#if SSL
+            if (this.secure)
+            {
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+                this.netStream.Close();
+#endif
+                this.sslStream.Close();
+            }
+            this.socket.Close();
+#else
+            this.socket.Close();
+#endif
+        }
+
+        /// <summary>
+        /// Accept connection from a remote client
+        /// </summary>
+        public void Accept()
+        {
+#if SSL
+            // secure channel requested
+            if (secure)
+            {
+#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+
+                this.netStream = new NetworkStream(this.socket);
+                this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
+
+                this.sslStream.AuthenticateAsServer(this.serverCert, false, MqttSslUtility.ToSslPlatformEnum(this.sslProtocol), false);
+#endif
+            }
+
+            return;
+#else
+            return;
+#endif
+        }
+    }
+
+    /// <summary>
+    /// IPAddress Utility class
+    /// </summary>
+    public static class IPAddressUtility
+    {
+        /// <summary>
+        /// Return AddressFamily for the IP address
+        /// </summary>
+        /// <param name="ipAddress">IP address to check</param>
+        /// <returns>Address family</returns>
+        public static AddressFamily GetAddressFamily(IPAddress ipAddress)
+        {
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
+            return ipAddress.AddressFamily;
+#else
+            return (ipAddress.ToString().IndexOf(':') != -1) ? 
+                AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork;
+#endif
+        }
+    }
+
+    /// <summary>
+    /// MQTT SSL utility class
+    /// </summary>
+    public static class MqttSslUtility
+    {
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !COMPACT_FRAMEWORK)
+        public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
+        {
+            switch (mqttSslProtocol)
+            {
+                case MqttSslProtocols.None:
+                    return SslProtocols.None;
+                case MqttSslProtocols.SSLv3:
+                    return SslProtocols.Ssl3;
+                case MqttSslProtocols.TLSv1_0:
+                    return SslProtocols.Tls;
+                /*case MqttSslProtocols.TLSv1_1:
+                    return SslProtocols.Tls11;
+                case MqttSslProtocols.TLSv1_2:
+                    return SslProtocols.Tls12;*/
+                default:
+                    throw new ArgumentException("SSL/TLS protocol version not supported");
+            }
+        }
+#elif (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
+        public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
+        {
+            switch (mqttSslProtocol)
+            {
+                case MqttSslProtocols.None:
+                    return SslProtocols.None;
+                case MqttSslProtocols.SSLv3:
+                    return SslProtocols.SSLv3;
+                case MqttSslProtocols.TLSv1_0:
+                    return SslProtocols.TLSv1;
+                case MqttSslProtocols.TLSv1_1:
+                case MqttSslProtocols.TLSv1_2:
+                default:
+                    throw new ArgumentException("SSL/TLS protocol version not supported");
+            }
+        }
+#endif
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Properties/AssemblyInfo.cs b/Librarys/mqtt/M2Mqtt/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..2d21558
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Properties/AssemblyInfo.cs
@@ -0,0 +1,44 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("M2Mqtt")]
+[assembly: AssemblyDescription("MQTT Client Library for M2M communication")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Paolo Patierno")]
+[assembly: AssemblyProduct("M2Mqtt")]
+[assembly: AssemblyCopyright("Copyright © Paolo Patierno 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("4.3.0.0")]
+// to avoid compilation error (AssemblyFileVersionAttribute doesn't exist) under .Net CF 3.5
+#if !WindowsCE
+[assembly: AssemblyFileVersion("4.3.0.0")]
+#endif
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt/Session/MqttBrokerSession.cs b/Librarys/mqtt/M2Mqtt/Session/MqttBrokerSession.cs
new file mode 100644
index 0000000..859213c
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Session/MqttBrokerSession.cs
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+#if BROKER
+using System.Collections;
+using System.Collections.Generic;
+using uPLibrary.Networking.M2Mqtt.Managers;
+using uPLibrary.Networking.M2Mqtt.Messages;
+
+namespace uPLibrary.Networking.M2Mqtt.Session
+{
+    /// <summary>
+    /// MQTT Broker Session
+    /// </summary>
+    public class MqttBrokerSession : MqttSession
+    {
+        /// <summary>
+        /// Client related to the subscription
+        /// </summary>
+        public MqttClient Client { get; set; }
+
+        /// <summary>
+        /// Subscriptions for the client session
+        /// </summary>
+        public List<MqttSubscription> Subscriptions;
+
+        /// <summary>
+        /// Outgoing messages to publish
+        /// </summary>
+        public Queue<MqttMsgPublish> OutgoingMessages;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttBrokerSession()
+            : base()
+        {
+            this.Client = null;
+            this.Subscriptions = new List<MqttSubscription>();
+            this.OutgoingMessages = new Queue<MqttMsgPublish>();
+        }
+
+        public override void Clear()
+        {
+            base.Clear();
+            this.Client = null;
+            this.Subscriptions.Clear();
+            this.OutgoingMessages.Clear();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt/Session/MqttClientSession.cs b/Librarys/mqtt/M2Mqtt/Session/MqttClientSession.cs
new file mode 100644
index 0000000..7613880
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Session/MqttClientSession.cs
@@ -0,0 +1,33 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+namespace uPLibrary.Networking.M2Mqtt.Session
+{
+    /// <summary>
+    /// MQTT Client Session
+    /// </summary>
+    public class MqttClientSession : MqttSession
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="clientId">Client Id to create session</param>
+        public MqttClientSession(string clientId)
+            : base(clientId)
+        {
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Session/MqttSession.cs b/Librarys/mqtt/M2Mqtt/Session/MqttSession.cs
new file mode 100644
index 0000000..712a854
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Session/MqttSession.cs
@@ -0,0 +1,63 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Collections;
+
+namespace uPLibrary.Networking.M2Mqtt.Session
+{
+    /// <summary>
+    /// MQTT Session base class
+    /// </summary>
+    public abstract class MqttSession
+    {
+        /// <summary>
+        /// Client Id
+        /// </summary>
+        public string ClientId { get; set; }
+
+        /// <summary>
+        /// Messages inflight during session
+        /// </summary>
+        public Hashtable InflightMessages { get; set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MqttSession()
+            : this(null)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="clientId">Client Id to create session</param>
+        public MqttSession(string clientId)
+        {
+            this.ClientId = clientId;
+            this.InflightMessages = new Hashtable();
+        }
+
+        /// <summary>
+        /// Clean session
+        /// </summary>
+        public virtual void Clear()
+        {
+            this.ClientId = null;
+            this.InflightMessages.Clear();
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Utility/QueueExtension.cs b/Librarys/mqtt/M2Mqtt/Utility/QueueExtension.cs
new file mode 100644
index 0000000..70175c3
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Utility/QueueExtension.cs
@@ -0,0 +1,50 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Collections;
+
+namespace uPLibrary.Networking.M2Mqtt.Utility
+{
+    /// <summary>
+    /// Extension class for a Queue
+    /// </summary>
+    internal static class QueueExtension
+    {
+        /// <summary>
+        /// Predicate for searching inside a queue
+        /// </summary>
+        /// <param name="item">Item of the queue</param>
+        /// <returns>Result of predicate</returns>
+        internal delegate bool QueuePredicate(object item);
+
+        /// <summary>
+        /// Get (without removing) an item from queue based on predicate
+        /// </summary>
+        /// <param name="queue">Queue in which to search</param>
+        /// <param name="predicate">Predicate to verify to get item</param>
+        /// <returns>Item matches the predicate</returns>
+        internal static object Get(Queue queue, QueuePredicate predicate)
+        {
+            foreach (var item in queue)
+            {
+                if (predicate(item))
+                    return item;
+            }
+            return null;
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/Utility/Trace.cs b/Librarys/mqtt/M2Mqtt/Utility/Trace.cs
new file mode 100644
index 0000000..c299ebe
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/Utility/Trace.cs
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Diagnostics;
+
+namespace uPLibrary.Networking.M2Mqtt.Utility
+{
+    /// <summary>
+    /// Tracing levels
+    /// </summary>
+    public enum TraceLevel
+    {
+        Error = 0x01,
+        Warning = 0x02,
+        Information = 0x04,
+        Verbose = 0x0F,
+        Frame = 0x10,
+        Queuing = 0x20
+    }
+
+    // delegate for writing trace
+    public delegate void WriteTrace(string format, params object[] args);
+
+    /// <summary>
+    /// Tracing class
+    /// </summary>
+    public static class Trace
+    {
+        public static TraceLevel TraceLevel;
+        public static WriteTrace TraceListener;
+
+        [Conditional("DEBUG")]
+        public static void Debug(string format, params object[] args)
+        {
+            if (TraceListener != null)
+            {
+                TraceListener(format, args);
+            }
+        }
+
+        public static void WriteLine(TraceLevel level, string format)
+        {
+            if (TraceListener != null && (level & TraceLevel) > 0)
+            {
+                TraceListener(format);
+            }
+        }
+
+        public static void WriteLine(TraceLevel level, string format, object arg1)
+        {
+            if (TraceListener != null && (level & TraceLevel) > 0)
+            {
+                TraceListener(format, arg1);
+            }
+        }
+
+        public static void WriteLine(TraceLevel level, string format, object arg1, object arg2)
+        {
+            if (TraceListener != null && (level & TraceLevel) > 0)
+            {
+                TraceListener(format, arg1, arg2);
+            }
+        }
+
+        public static void WriteLine(TraceLevel level, string format, object arg1, object arg2, object arg3)
+        {
+            if (TraceListener != null && (level & TraceLevel) > 0)
+            {
+                TraceListener(format, arg1, arg2, arg3);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Librarys/mqtt/M2Mqtt/WinRT/Fx.cs b/Librarys/mqtt/M2Mqtt/WinRT/Fx.cs
new file mode 100644
index 0000000..6d62d28
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/WinRT/Fx.cs
@@ -0,0 +1,36 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Support methods fos specific framework
+    /// </summary>
+    public class Fx
+    {
+
+        public delegate void ThreadStart();
+        public static void StartThread(ThreadStart threadStart)
+        {
+            Task.Factory.StartNew(o => ((ThreadStart)o)(), threadStart);
+        }
+
+        public static void SleepThread(int millisecondsTimeout) { Task.Delay(millisecondsTimeout).RunSynchronously(); }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/WinRT/Hashtable.cs b/Librarys/mqtt/M2Mqtt/WinRT/Hashtable.cs
new file mode 100644
index 0000000..a42532b
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/WinRT/Hashtable.cs
@@ -0,0 +1,27 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Collections.Generic;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Wrapper Hashtable class for generic Dictionary<TKey,TValue> (the only available in WinRT)
+    /// </summary>
+    public class Hashtable : Dictionary<object, object>
+    {
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/WinRT/MqttNetworkChannel.cs b/Librarys/mqtt/M2Mqtt/WinRT/MqttNetworkChannel.cs
new file mode 100644
index 0000000..305992c
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/WinRT/MqttNetworkChannel.cs
@@ -0,0 +1,179 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Networking;
+using Windows.Networking.Sockets;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Storage.Streams;
+using System.Threading;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    public class MqttNetworkChannel : IMqttNetworkChannel
+    {
+        // stream socket for communication
+        private StreamSocket socket;
+
+        // remote host information
+        private HostName remoteHostName;
+        private int remotePort;
+
+        // using SSL
+        private bool secure;
+
+        // SSL/TLS protocol version
+        private MqttSslProtocols sslProtocol;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="socket">Socket opened with the client</param>
+        public MqttNetworkChannel(StreamSocket socket)
+        {
+            this.socket = socket;
+            this.sslProtocol = MqttSslProtocols.None;
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="remoteHostName">Remote Host name</param>
+        /// <param name="remotePort">Remote port</param>
+        /// <param name="secure">Using SSL</param>
+        /// <param name="sslProtocol">SSL/TLS protocol version</param>
+        public MqttNetworkChannel(string remoteHostName, int remotePort, bool secure, MqttSslProtocols sslProtocol)
+        {
+            this.remoteHostName = new HostName(remoteHostName);
+            this.remotePort = remotePort;
+            this.secure = secure;
+            this.sslProtocol = sslProtocol;
+
+            if (secure && (sslProtocol == MqttSslProtocols.None))
+                throw new ArgumentException("For secure connection, an SSL/TLS protocol version is needed");
+        }
+
+        public bool DataAvailable
+        {
+            get { return true; }
+        }
+
+        public int Receive(byte[] buffer)
+        {
+            IBuffer result;
+
+            // read all data needed (until fill buffer)
+            int idx = 0;
+            while (idx < buffer.Length)
+            {
+                // fixed scenario with socket closed gracefully by peer/broker and
+                // Read return 0. Avoid infinite loop.
+
+                // read is executed synchronously
+                result = this.socket.InputStream.ReadAsync(buffer.AsBuffer(), (uint)buffer.Length, InputStreamOptions.None).AsTask().Result;
+                if (result.Length == 0)
+                    return 0;
+                idx += (int)result.Length;
+            }
+            return buffer.Length;
+        }
+
+        public int Receive(byte[] buffer, int timeout)
+        {
+            CancellationTokenSource cts = new CancellationTokenSource(timeout);
+
+            try
+            {
+                IBuffer result;
+
+                // read all data needed (until fill buffer)
+                int idx = 0;
+                while (idx < buffer.Length)
+                {
+                    // fixed scenario with socket closed gracefully by peer/broker and
+                    // Read return 0. Avoid infinite loop.
+
+                    // read is executed synchronously
+                    result = this.socket.InputStream.ReadAsync(buffer.AsBuffer(), (uint)buffer.Length, InputStreamOptions.None).AsTask(cts.Token).Result;
+                    if (result.Length == 0)
+                        return 0;
+                    idx += (int)result.Length;
+                }
+                return buffer.Length;
+            }
+            catch (TaskCanceledException)
+            {
+                return 0;
+            }
+        }
+
+        public int Send(byte[] buffer)
+        {
+            // send is executed synchronously
+            return (int)this.socket.OutputStream.WriteAsync(buffer.AsBuffer()).AsTask().Result;
+        }
+
+        public void Close()
+        {
+            this.socket.Dispose();
+        }
+
+        public void Connect()
+        {
+            this.socket = new StreamSocket();
+
+            // connection is executed synchronously
+            this.socket.ConnectAsync(this.remoteHostName,
+                this.remotePort.ToString(),
+                MqttSslUtility.ToSslPlatformEnum(this.sslProtocol)).AsTask().Wait();
+        }
+
+        public void Accept()
+        {
+            // TODO : SSL support with StreamSocket / StreamSocketListener seems to be NOT supported
+            return;
+        }
+    }
+
+    /// <summary>
+    /// MQTT SSL utility class
+    /// </summary>
+    public static class MqttSslUtility
+    {
+        public static SocketProtectionLevel ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
+        {
+            switch (mqttSslProtocol)
+            {
+                case MqttSslProtocols.None:
+                    return SocketProtectionLevel.PlainSocket;
+                case MqttSslProtocols.SSLv3:
+                    return SocketProtectionLevel.SslAllowNullEncryption;
+                case MqttSslProtocols.TLSv1_0:
+                    return SocketProtectionLevel.Tls10;
+                case MqttSslProtocols.TLSv1_1:
+                    return SocketProtectionLevel.Tls11;
+                case MqttSslProtocols.TLSv1_2:
+                    return SocketProtectionLevel.Tls12;
+                default:
+                    throw new ArgumentException("SSL/TLS protocol version not supported");
+            }
+        }
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/WinRT/Queue.cs b/Librarys/mqtt/M2Mqtt/WinRT/Queue.cs
new file mode 100644
index 0000000..bc6728f
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt/WinRT/Queue.cs
@@ -0,0 +1,27 @@
+/*
+Copyright (c) 2013, 2014 Paolo Patierno
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution. 
+
+The Eclipse Public License is available at 
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at 
+   http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+   Paolo Patierno - initial API and implementation and/or initial documentation
+*/
+
+using System.Collections.Generic;
+
+namespace uPLibrary.Networking.M2Mqtt
+{
+    /// <summary>
+    /// Wrapper Queue class for generic Queue<T> (the only available in WinRT)
+    /// </summary>
+    public class Queue : Queue<object>
+    {
+    }
+}
diff --git a/Librarys/mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll b/Librarys/mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll
new file mode 100644
index 0000000..dcbbb88
Binary files /dev/null and b/Librarys/mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll differ
diff --git a/Librarys/mqtt/M2Mqtt/bin/Release/M2Mqtt.dll b/Librarys/mqtt/M2Mqtt/bin/Release/M2Mqtt.dll
new file mode 100644
index 0000000..f3f4a49
Binary files /dev/null and b/Librarys/mqtt/M2Mqtt/bin/Release/M2Mqtt.dll differ
diff --git a/Librarys/mqtt/M2Mqtt_2.sln b/Librarys/mqtt/M2Mqtt_2.sln
new file mode 100644
index 0000000..f7dc3a3
--- /dev/null
+++ b/Librarys/mqtt/M2Mqtt_2.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt_2", "M2Mqtt\M2Mqtt_2.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {135814CF-A469-4436-9C51-3CFE4B93D2FE}
+	EndGlobalSection
+EndGlobal
diff --git a/Utils/IoT.sln b/Utils/IoT.sln
index 77f9d9e..e6e56fb 100644
--- a/Utils/IoT.sln
+++ b/Utils/IoT.sln
@@ -11,6 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "IoT\Co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "IoT\Connector\User\Telegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +37,14 @@ Global
 		{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Utils/IoT/Connector/ADataBackend.cs b/Utils/IoT/Connector/ADataBackend.cs
index 550905a..27e7d21 100644
--- a/Utils/IoT/Connector/ADataBackend.cs
+++ b/Utils/IoT/Connector/ADataBackend.cs
@@ -17,7 +17,11 @@ namespace BlubbFish.Utils.IoT.Connector {
       try {
         t = Type.GetType(object_sensor, true);
       } catch (TypeLoadException) {
-        throw new ArgumentException("settings.ini: " + settings["type"] + " is not a DataBackend");
+        Console.Error.WriteLine("settings.ini: " + settings["type"] + " is not a DataBackend");
+        return null;
+      } catch(System.IO.FileNotFoundException) {
+        Console.Error.WriteLine("Driver " + settings["type"] + " could not load!");
+        return null;
       }
       return (ADataBackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
     }
diff --git a/Utils/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj b/Utils/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj
index 3df94cc..90b5ce8 100644
--- a/Utils/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj
+++ b/Utils/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
     <AssemblyName>ConnectorDataMosquitto</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll
index ce671c5..1cf5cf3 100644
Binary files a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll and b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll differ
diff --git a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll
index f00f11f..b86c7b7 100644
Binary files a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll and b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll differ
diff --git a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll
index e569d45..83a94ec 100644
Binary files a/Utils/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll and b/Utils/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj b/Utils/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj
index 54de2c9..a6e7573 100644
--- a/Utils/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj
+++ b/Utils/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
     <AssemblyName>ConnectorDataMqtt</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="M2Mqtt.Net, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\M2Mqtt.4.3.0.0\lib\net45\M2Mqtt.Net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -47,9 +45,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj">
+      <Project>{a11aef5a-b246-4fe8-8330-06db73cc8074}</Project>
+      <Name>M2Mqtt</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Utils-IoT.csproj">
       <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
       <Name>Utils-IoT</Name>
diff --git a/Utils/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll b/Utils/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll
index 52d6034..ef7007b 100644
Binary files a/Utils/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll and b/Utils/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll b/Utils/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll
index f00f11f..d2229a7 100644
Binary files a/Utils/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll and b/Utils/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll b/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll
deleted file mode 100644
index 154580d..0000000
Binary files a/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll and /dev/null differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.dll b/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.dll
new file mode 100644
index 0000000..dcbbb88
Binary files /dev/null and b/Utils/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.dll differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll b/Utils/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll
index e569d45..88af254 100644
Binary files a/Utils/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll and b/Utils/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll differ
diff --git a/Utils/IoT/Connector/Data/Mqtt/packages.config b/Utils/IoT/Connector/Data/Mqtt/packages.config
deleted file mode 100644
index aa6d30c..0000000
--- a/Utils/IoT/Connector/Data/Mqtt/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="M2Mqtt" version="4.3.0.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/Utils/IoT/Connector/User/Telegram/ConnectorUserTelegram.csproj b/Utils/IoT/Connector/User/Telegram/ConnectorUserTelegram.csproj
index 8ef845b..34ecf6b 100644
--- a/Utils/IoT/Connector/User/Telegram/ConnectorUserTelegram.csproj
+++ b/Utils/IoT/Connector/User/Telegram/ConnectorUserTelegram.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils.IoT.Connector.User</RootNamespace>
     <AssemblyName>ConnectorUserTelegram</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Utils/IoT/Connector/User/Telegram/app.config b/Utils/IoT/Connector/User/Telegram/app.config
index 8676824..d14bbb2 100644
--- a/Utils/IoT/Connector/User/Telegram/app.config
+++ b/Utils/IoT/Connector/User/Telegram/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
diff --git a/Utils/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll b/Utils/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll
index 9c1c87e..571bdbc 100644
Binary files a/Utils/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll and b/Utils/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll differ
diff --git a/Utils/IoT/Connector/User/Telegram/bin/Release/LitJson.dll b/Utils/IoT/Connector/User/Telegram/bin/Release/LitJson.dll
index f00f11f..b86c7b7 100644
Binary files a/Utils/IoT/Connector/User/Telegram/bin/Release/LitJson.dll and b/Utils/IoT/Connector/User/Telegram/bin/Release/LitJson.dll differ
diff --git a/Utils/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll b/Utils/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll
index 6f8d8fe..83a94ec 100644
Binary files a/Utils/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll and b/Utils/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll differ
diff --git a/Utils/IoT/Connector/User/Telegram/packages.config b/Utils/IoT/Connector/User/Telegram/packages.config
index 9faada8..40cda53 100644
--- a/Utils/IoT/Connector/User/Telegram/packages.config
+++ b/Utils/IoT/Connector/User/Telegram/packages.config
@@ -4,44 +4,44 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
   <package id="System.Console" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
   <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Net.Http" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Threading" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
diff --git a/Utils/IoT/Utils-IoT.csproj b/Utils/IoT/Utils-IoT.csproj
index d060c2a..9a1e212 100644
--- a/Utils/IoT/Utils-IoT.csproj
+++ b/Utils/IoT/Utils-IoT.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
     <AssemblyName>Utils-IoT</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -61,7 +58,10 @@
     <Compile Include="Sensor\Temperatur.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
+      <Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
+      <Name>litjson_4.7.1</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Utils/IoT/bin/Release/Utils-IoT.dll b/Utils/IoT/bin/Release/Utils-IoT.dll
index e569d45..88af254 100644
Binary files a/Utils/IoT/bin/Release/Utils-IoT.dll and b/Utils/IoT/bin/Release/Utils-IoT.dll differ
diff --git a/Utils/IoT/packages.config b/Utils/IoT/packages.config
deleted file mode 100644
index da90ce2..0000000
--- a/Utils/IoT/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="LitJson" version="0.9.0" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/Utils/Utils/InIReader.cs b/Utils/Utils/InIReader.cs
index c87b449..1da1d31 100644
--- a/Utils/Utils/InIReader.cs
+++ b/Utils/Utils/InIReader.cs
@@ -23,6 +23,11 @@ namespace BlubbFish.Utils
       LoadFile();
     }
 
+    /// <summary>
+    /// Gibt eine InIReader-Instanz zu einer Datei zurück
+    /// </summary>
+    /// <param name="filename">Dateiname</param>
+    /// <returns></returns>
     public static InIReader GetInstance(String filename)
     {
       if (!instances.Keys.Contains(filename)) {
@@ -72,6 +77,11 @@ namespace BlubbFish.Utils
       }
     }
 
+    /// <summary>
+    /// Gibt eine Liste an Sektionen zurück
+    /// </summary>
+    /// <param name="withBrackets">Default = true; false, wenn die Liste ohne Klammern sein soll.</param>
+    /// <returns></returns>
     public List<String> GetSections(Boolean withBrackets = true)
     {
       if(withBrackets) {
@@ -85,6 +95,24 @@ namespace BlubbFish.Utils
       }
     }
 
+    /// <summary>
+    /// Überschreibt eine InI-Datei mit der Kompletten neuen Configuration
+    /// </summary>
+    /// <param name="config">Neue Konfiguration</param>
+    public void SetSections(Dictionary<String, Dictionary<String, String>> config) {
+      this.inifile.Clear();
+      foreach (KeyValuePair<String, Dictionary<String, String>> item in config) {
+        String key = item.Key;
+        if(!key.StartsWith("[")) {
+          key = "[" + key + "]";
+        }
+        if (Regex.Match(key, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase).Success) {
+          this.inifile.Add(key, item.Value);
+        }
+      }
+      this.Changed();
+    }
+
     public Dictionary<String, String> GetSection(String section) {
       if(this.inifile.Keys.Contains(section)) {
         return this.inifile[section];
@@ -95,6 +123,12 @@ namespace BlubbFish.Utils
       return new Dictionary<String, String>();
     }
 
+    /// <summary>
+    /// Gibt einen einzelnen Wert zurück
+    /// </summary>
+    /// <param name="section">Name der Sektion</param>
+    /// <param name="key">Name des Wertes</param>
+    /// <returns></returns>
     public String GetValue(String section, String key)
     {
       if (!section.StartsWith("[")) {
@@ -108,7 +142,12 @@ namespace BlubbFish.Utils
       return null;
     }
 
-
+    /// <summary>
+    /// Setzt einen Wert in einer Sektion
+    /// </summary>
+    /// <param name="section">Name der Sektion</param>
+    /// <param name="key">Name des Wertes</param>
+    /// <param name="value">Wert</param>
     public void SetValue(String section, String key, String value)
     {
       if (!section.StartsWith("[")) {
diff --git a/Utils/Utils/Properties/AssemblyInfo.cs b/Utils/Utils/Properties/AssemblyInfo.cs
index 0e88670..056d70e 100644
--- a/Utils/Utils/Properties/AssemblyInfo.cs
+++ b/Utils/Utils/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2014 - 25.09.2017")]
+[assembly: AssemblyCopyright("Copyright ©  2014 - 22.12.2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.2")]
-[assembly: AssemblyFileVersion("1.0.5.2")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
diff --git a/Utils/Utils/Utils.csproj b/Utils/Utils/Utils.csproj
index 61274ab..e7f6b5f 100644
--- a/Utils/Utils/Utils.csproj
+++ b/Utils/Utils/Utils.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils</RootNamespace>
     <AssemblyName>Utils</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Utils/Utils/bin/Release/Utils.dll b/Utils/Utils/bin/Release/Utils.dll
index b86be2c..1153098 100644
Binary files a/Utils/Utils/bin/Release/Utils.dll and b/Utils/Utils/bin/Release/Utils.dll differ
diff --git a/Zway-Bot/Zway-Bot.sln b/Zway-Bot/Zway-Bot.sln
index a09d74a..6595bd9 100644
--- a/Zway-Bot/Zway-Bot.sln
+++ b/Zway-Bot/Zway-Bot.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Uti
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils\IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "..\Utils\IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
 EndProject
 Global
@@ -37,10 +35,6 @@ Global
 		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Zway-Bot/Zway-Bot/Helper.cs b/Zway-Bot/Zway-Bot/Helper.cs
index ed5f7db..9746276 100644
--- a/Zway-Bot/Zway-Bot/Helper.cs
+++ b/Zway-Bot/Zway-Bot/Helper.cs
@@ -59,5 +59,15 @@ namespace ZwayBot {
       Console.Error.WriteLine("ERROR: " + text);
       Console.ResetColor();
     }
+
+    internal static String ToUpperLower(this String s) {
+      if(s.Length == 0) {
+        return "";
+      }
+      if(s.Length == 1) {
+        return s.ToUpper();
+      }
+      return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
+    }
   }
 }
diff --git a/Zway-Bot/Zway-Bot/Moduls/AModul.cs b/Zway-Bot/Zway-Bot/Moduls/AModul.cs
index 7ffa1e0..7eeb233 100644
--- a/Zway-Bot/Zway-Bot/Moduls/AModul.cs
+++ b/Zway-Bot/Zway-Bot/Moduls/AModul.cs
@@ -6,14 +6,44 @@ using BlubbFish.Utils;
 namespace ZwayBot {
   abstract class AModul {
     protected ZwayController zw;
-    protected InIReader ini;
+    private InIReader settings;
+    protected Dictionary<String, Dictionary<String, String>> config = new Dictionary<String, Dictionary<String, String>>();
+
+    public Boolean HasConfig { get; private set; }
+    public Boolean ConfigPublic { get; private set; }
 
     public delegate void ModulEvent(Object sender, ModulEventArgs e);
     public abstract event ModulEvent Update;
 
     public AModul(ZwayController zway, InIReader settings) {
+      this.HasConfig = false;
+      this.ConfigPublic = false;
       this.zw = zway;
-      this.ini = settings;
+      this.settings = settings;
+      this.ParseConfig();
+    }
+
+    private void ParseConfig() {
+      if (this.settings != null) {
+        this.HasConfig = true;
+        foreach (String item in this.settings.GetSections(false)) {
+          this.config.Add(item, this.settings.GetSection(item));
+        }
+        if(this.config.ContainsKey("modul")) {
+          this.ConfigPublic = this.config["modul"].ContainsKey("config") && this.config["modul"]["config"].ToLower() == "public";
+        }
+      }
+    }
+
+    public Dictionary<String, Dictionary<String, String>> GetConfig() {
+      if (this.HasConfig && this.ConfigPublic) {
+        Dictionary<String, Dictionary<String, String>> ret = new Dictionary<String, Dictionary<String, String>>(this.config);
+        if(ret.ContainsKey("modul")) {
+          ret.Remove("modul");
+        }
+        return ret;
+      }
+      return new Dictionary<String, Dictionary<String, String>>();
     }
 
     public virtual void Interconnect(Dictionary<String, AModul> moduls) { }
@@ -21,5 +51,21 @@ namespace ZwayBot {
     public virtual void SetInterconnection(String param, Action<Object> hook, Object data) { }
 
     public abstract void Dispose();
+
+    internal void SetConfig(Dictionary<String, Dictionary<String, String>> newconf) {
+      if (this.HasConfig && this.ConfigPublic) {
+        if (newconf.ContainsKey("modul")) {
+          newconf.Remove("modul");
+        }
+        if (this.config.ContainsKey("modul")) {
+          newconf.Add("modul", this.config["modul"]);
+        }
+        this.config = newconf;
+        this.settings.SetSections(this.config);
+        this.UpdateConfig();
+      }
+    }
+
+    protected abstract void UpdateConfig();
   }
 }
diff --git a/Zway-Bot/Zway-Bot/Moduls/CronJob.cs b/Zway-Bot/Zway-Bot/Moduls/CronJob.cs
index bce9039..a7ee8da 100644
--- a/Zway-Bot/Zway-Bot/Moduls/CronJob.cs
+++ b/Zway-Bot/Zway-Bot/Moduls/CronJob.cs
@@ -36,10 +36,10 @@ namespace ZwayBot.Moduls {
       while (true) {
         if(this.crontime.Minute != DateTime.Now.Minute) {
           this.crontime = DateTime.Now;
-          if (this.ini != null) {
-            foreach (String item in this.ini.GetSections()) {
-              if (this.ParseCronString(this.ini.GetValue(item, "cron"))) {
-                this.SetValues(this.ini.GetValue(item, "set"));
+          if (this.config.Count != 0) {
+            foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
+              if (item.Value.ContainsKey("cron") && item.Value.ContainsKey("set") && this.ParseCronString(item.Value["cron"])) {
+                this.SetValues(item.Value["set"]);
               }
             }
           }
@@ -157,6 +157,8 @@ namespace ZwayBot.Moduls {
       this.internalCron.Add(new Tuple<String, Action<Object>, Object>(cron, hook, data));
     }
 
+    protected override void UpdateConfig() { }
+
     #region IDisposable Support
     private Boolean disposedValue = false;
 
diff --git a/Zway-Bot/Zway-Bot/Moduls/Flex4Grid.cs b/Zway-Bot/Zway-Bot/Moduls/Flex4Grid.cs
deleted file mode 100644
index 7323228..0000000
--- a/Zway-Bot/Zway-Bot/Moduls/Flex4Grid.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using BlubbFish.IoT.Zway;
-using BlubbFish.IoT.Zway.Devices;
-using BlubbFish.IoT.Zway.Devices.CommandClasses;
-using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
-using BlubbFish.IoT.Zway.Events;
-using BlubbFish.IoT.Zway.Interfaces;
-using BlubbFish.Utils;
-using BlubbFish.Utils.IoT.Connector;
-using LitJson;
-
-namespace ZwayBot.Moduls {
-  class Flex4Grid : AModul, IDisposable {
-    private ADataBackend mqtt;
-    private String household = "";
-    private Object requestalivelock = new Object();
-
-    public override event ModulEvent Update;
-
-    public Flex4Grid(ZwayController zway, InIReader settings) : base(zway, settings) {
-      this.mqtt = ADataBackend.GetInstance(this.ini.GetSection("settings"));
-      this.ParseIni();
-      this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
-    }
-
-    private void ParseIni() {
-      if (this.ini.GetValue("zway", "devices") != null) {
-        foreach (String device in this.ini.GetValue("zway", "devices").Split(',')) {
-          Int32 deviceid = Int32.Parse(device);
-          if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0)) {
-            this.zw.Devices[deviceid].Instances[0].Update += this.DeviceUpdate;
-          }
-        }
-      }
-      if(this.ini.GetValue("f4g", "household") != null) {
-        this.household = this.ini.GetValue("f4g", "household");
-      }
-    }
-
-    private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
-      Instance instance = (Instance)sender;
-      if(e.Parent.GetType() == typeof(Switchbinary)) {
-        if (instance.CommandClasses.ContainsKey(ACommandClass.Classes.SwitchBinary)) {
-          String topic = "/flex4grid/v1/households/" + this.household + "/device/state";
-          String text = JsonMapper.ToJson(new Dictionary<String, String>() {
-            { "status", ((Switchbinary)instance.CommandClasses[ACommandClass.Classes.SwitchBinary]).Level?"active":"idle" },
-            { "timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'") },
-            { "type", ((Switchbinary)instance.CommandClasses[ACommandClass.Classes.SwitchBinary]).Name },
-            { "id", instance.DeviceId.ToString() }
-          }).ToString();
-          this.mqtt.Send(topic, text);
-          this.Update?.Invoke(this, new Flex4gridEvent(topic, text));
-        }
-      } else if(e.Parent.GetType() == typeof(Sensormultilevelsub) || e.Parent.GetType() == typeof(Metersub)) {
-        if (instance.CommandClasses.ContainsKey(ACommandClass.Classes.SensorMultilevel) && 
-          ((Sensormultilevel)instance.CommandClasses[ACommandClass.Classes.SensorMultilevel]).Sub.ContainsKey(4) &&
-          instance.CommandClasses.ContainsKey(ACommandClass.Classes.Meter) && ((Meter)instance.CommandClasses[ACommandClass.Classes.Meter]).Sub.ContainsKey(0)) {
-          String topic = "/flex4grid/v1/households/" + this.household + "/device/consumption";
-          String text = JsonMapper.ToJson(new Dictionary<String, String>() {
-            { "timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'") },
-            { "id", instance.DeviceId.ToString() },
-            { "power", Math.Round(((Sensormultilevelsub)((Sensormultilevel)instance.CommandClasses[ACommandClass.Classes.SensorMultilevel]).Sub[4]).Level).ToString("F0") },
-            { "energyCumul", ((Metersub)((Meter)instance.CommandClasses[ACommandClass.Classes.Meter]).Sub[0]).Level.ToString() }
-          }).ToString();
-          this.mqtt.Send(topic, text);
-          this.Update?.Invoke(this, new Flex4gridEvent(topic, text));
-        }
-      }
-    }
-
-    private void Mqtt_MessageIncomming(Object sender, MqttEventArgs e) {
-      JsonData message;
-      String topic = e.Topic;
-      try {
-        if (e.Message.StartsWith("{")) {
-          message = JsonMapper.ToObject(e.Message);
-        } else {
-          return;
-        }
-      } catch (Exception) {
-        return;
-      }
-      if(topic == "/flex4grid/v1/households/" + this.household + "/device/actuate") {
-        if(message.Keys.Contains("deviceId") && message.Keys.Contains("command")) {
-          String device = message["deviceId"].ToString();
-          if(this.ini.GetValue("zway", "devices") != null) {
-            foreach (String item in this.ini.GetValue("zway", "devices").Split(',')) {
-              if (item == device) {
-                Int32 deviceid = Int32.Parse(device);
-                if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0) && 
-                  this.zw.Devices[deviceid].Instances[0].CommandClasses.ContainsKey(ACommandClass.Classes.SwitchBinary)) {
-                  ((Switchbinary)this.zw.Devices[deviceid].Instances[0].CommandClasses[ACommandClass.Classes.SwitchBinary]).Level = message["command"].ToString() == "ON";
-                }
-              }
-            }
-          }
-        }
-      }
-      if (topic == "/flex4grid/v1/households/" + this.household + "/devices/state/request") {
-        if (this.ini.GetValue("zway", "devices") != null) {
-          Dictionary<String, String> response = new Dictionary<String, String>();
-          foreach (String device in this.ini.GetValue("zway", "devices").Split(',')) {
-            Int32 deviceid = Int32.Parse(device);
-            if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0)) {
-              if (this.zw.Devices[deviceid].Instances[0].CommandClasses.ContainsKey(ACommandClass.Classes.SwitchBinary)) {
-                Switchbinary sw = ((Switchbinary)this.zw.Devices[deviceid].Instances[0].CommandClasses[ACommandClass.Classes.SwitchBinary]);
-                response.Add(sw.DeviceId.ToString(), sw.Level ? "active" : "idle");
-              }
-            }
-          }
-          if(response.Count != 0) {
-            response.Add("timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'"));
-            String rtopic = "/flex4grid/v1/households/" + this.household + "/devices/state/response";
-            String rtext = JsonMapper.ToJson(response).ToString();
-          }
-        }
-      }
-    }
-
-    private void RequestAlive(Object o) {
-      String raspi = this.ini.GetValue("f4g", "raspi");
-      lock (this.requestalivelock) {
-        String req = "https://wiki.flex4grid.eu/rupdate/rupdate_general.yml.gpg.asc?gw=" + raspi;
-        HttpWebRequest request = WebRequest.CreateHttp(req);
-        try {
-          using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
-            this.Update?.Invoke(this, new Flex4gridEvent(req, response.StatusCode.ToString()));
-          }
-        } catch (Exception) { }
-      }
-      lock (this.requestalivelock) {
-        String req = "https://wiki.flex4grid.eu/rupdate/rupdate_general.yml?gw=" + raspi;
-        HttpWebRequest request = WebRequest.CreateHttp(req);
-        try {
-          using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
-            this.Update?.Invoke(this, new Flex4gridEvent(req, response.StatusCode.ToString()));
-          }
-        } catch (Exception) { }
-      }
-      lock (this.requestalivelock) {
-        String req = "http://swb.pcs.flex4grid.eu/gateway/" + raspi;
-        HttpWebRequest request = WebRequest.CreateHttp(req);
-        try {
-          using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
-            this.Update?.Invoke(this, new Flex4gridEvent(req, response.StatusCode.ToString()));
-          }
-        } catch (Exception) { }
-      }
-    }
-
-    public override void Interconnect(Dictionary<String, AModul> moduls) {
-      if (this.ini.GetValue("f4g", "raspi") != null) {
-        foreach (KeyValuePair<String, AModul> item in moduls) {
-          if (item.Value is CronJob) {
-            item.Value.SetInterconnection("10,40 * * * *", new Action<Object>(this.RequestAlive), null);
-          }
-        }
-      }
-    }
-
-    #region IDisposable Support
-    private Boolean disposedValue = false;
-
-    protected virtual void Dispose(Boolean disposing) {
-      if (!this.disposedValue) {
-        if (disposing) {
-          this.mqtt.Dispose();
-        }
-        this.disposedValue = true;
-      }
-    }
-
-    ~Flex4Grid() {
-      Dispose(false);
-    }
-
-    public override void Dispose() {
-      Dispose(true);
-      GC.SuppressFinalize(this);
-    }
-
-    
-    #endregion
-  }
-}
diff --git a/Zway-Bot/Zway-Bot/Moduls/Mqtt.cs b/Zway-Bot/Zway-Bot/Moduls/Mqtt.cs
index 0411ea8..4254da9 100644
--- a/Zway-Bot/Zway-Bot/Moduls/Mqtt.cs
+++ b/Zway-Bot/Zway-Bot/Moduls/Mqtt.cs
@@ -1,20 +1,26 @@
 using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using BlubbFish.IoT.Zway;
 using BlubbFish.IoT.Zway.Events;
 using BlubbFish.IoT.Zway.Interfaces;
 using BlubbFish.Utils;
 using BlubbFish.Utils.IoT.Connector;
+using LitJson;
 
 namespace ZwayBot.Moduls {
   class Mqtt : AModul, IDisposable {
     private ADataBackend mqtt;
+    private Dictionary<String, AModul> modules;
 
     public override event ModulEvent Update;
 
     public Mqtt(ZwayController zway, InIReader settings) : base(zway, settings) {
-      this.mqtt = ADataBackend.GetInstance(this.ini.GetSection("settings"));
-      this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
-      this.zw.Update += this.ZwayEvent;
+      if (this.config.ContainsKey("settings")) {
+        this.mqtt = ADataBackend.GetInstance(this.config["settings"]);
+        this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
+        this.zw.Update += this.ZwayEvent;
+      }
     }
 
     private void ZwayEvent(Object sender, DeviceUpdateEvent e) {
@@ -32,11 +38,80 @@ namespace ZwayBot.Moduls {
     }
 
     private void Mqtt_MessageIncomming(Object sender, MqttEventArgs e) {
-      if(e.Message.StartsWith("/zwavebot/devices/") && e.Message.EndsWith("set")) {
-
+      if (e.Topic.StartsWith("/zwavebot/devices/") && (e.Topic.EndsWith("/set") || e.Topic.EndsWith("/get"))) {
+        Match m = new Regex("^/zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/[gs]et$|^/zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/(\\d+)/[gs]et$").Match(e.Topic);
+        String id = "";
+        if(m.Groups[1].Success) {
+          id = m.Groups[1].Value + "-" + m.Groups[2].Value + "-" + m.Groups[3].Value;
+        }
+        if(m.Groups[4].Success) {
+          id = m.Groups[4].Value + "-" + m.Groups[5].Value + "-" + m.Groups[6].Value + "-" + m.Groups[7].Value;
+        }
+        ACommandClass c = this.zw.GetCommandClass(id);
+        if(c == null) {
+          return;
+        }
+        if (e.Topic.EndsWith("/set")) {
+          try {
+            JsonData a = JsonMapper.ToObject(e.Message);
+            foreach (String item in a.Keys) {
+              String key = item.ToUpperLower();
+              if (c.HasProperty(key)) {
+                c.SetProperty(key, a[item].ToString());
+                this.Update?.Invoke(this, new MqttEvent(c.Id, a[item].ToString()));
+              }
+            }
+          } catch (Exception) { }
+        } else if(e.Topic.EndsWith("/get")) {
+          c.PollOnce = true;
+          this.mqtt.Send("/zwavebot/devices/" + c.MqttTopic(), c.ToJson());
+          this.Update?.Invoke(this, new MqttEvent(e.Topic, "Dataget"));
+        }
+      }
+      if (e.Topic.StartsWith("/zwavebot/config/") && (e.Topic.EndsWith("/set") || e.Topic.EndsWith("/get"))) {
+        Match m = new Regex("^/zwavebot/config/(\\w+)/[gs]et$|").Match(e.Topic);
+        if (!m.Groups[1].Success) {
+          return;
+        }
+        AModul modul = null;
+        foreach (KeyValuePair<String, AModul> item in this.modules) {
+          if (item.Key.ToLower() == m.Groups[1].Value) {
+            modul = item.Value;
+          }
+        }
+        if (modul == null) {
+          return;
+        }
+        if(e.Topic.EndsWith("/get") && modul.HasConfig && modul.ConfigPublic) {
+          String topic = "/zwavebot/config/" + m.Groups[1].Value;
+          String data = JsonMapper.ToJson(modul.GetConfig()).ToString();
+          this.mqtt.Send(topic, data);
+          this.Update?.Invoke(this, new MqttEvent(topic, data));
+        }
+        if (e.Topic.EndsWith("/set") && modul.HasConfig && modul.ConfigPublic) {
+          try {
+            JsonData a = JsonMapper.ToObject(e.Message);
+            Dictionary<String, Dictionary<String, String>> newconf = new Dictionary<String, Dictionary<String, String>>();
+            foreach (String section in a.Keys) {
+              Dictionary<String, String> sectiondata = new Dictionary<String, String>();
+              foreach (String item in a[section].Keys) {
+                sectiondata.Add(item, a[section][item].ToString());
+              }
+              newconf.Add(section, sectiondata);
+            }
+            modul.SetConfig(newconf);
+            this.Update?.Invoke(this, new MqttEvent("New Config", "Write"));
+          } catch (Exception) { }
+        }
       }
     }
 
+    public override void Interconnect(Dictionary<String, AModul> moduls) {
+      this.modules = moduls;
+    }
+
+    protected override void UpdateConfig() { }
+
     #region IDisposable Support
     private Boolean disposedValue = false;
 
diff --git a/Zway-Bot/Zway-Bot/Moduls/Overtaker.cs b/Zway-Bot/Zway-Bot/Moduls/Overtaker.cs
index d758bbc..ffc7782 100644
--- a/Zway-Bot/Zway-Bot/Moduls/Overtaker.cs
+++ b/Zway-Bot/Zway-Bot/Moduls/Overtaker.cs
@@ -16,14 +16,16 @@ namespace ZwayBot.Moduls {
     }
 
     private void ParseIni() {
-      foreach (String item in this.ini.GetSections()) {
-        String from = this.ini.GetValue(item, "from");
-        String[] source = from.Split(':');
-        this.events.Add(source[0], this.ini.GetSection(item));
-        ACommandClass c = this.zw.GetCommandClass(source[0]);
-        if (c != null) {
-          c.Polling = true;
-          c.Update += this.ChangedEvent;
+      foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
+        if (item.Value.ContainsKey("from")) {
+          String from = item.Value["from"];
+          String[] source = from.Split(':');
+          this.events.Add(source[0], item.Value);
+          ACommandClass c = this.zw.GetCommandClass(source[0]);
+          if (c != null) {
+            c.Polling = true;
+            c.Update += this.ChangedEvent;
+          }
         }
       }
     }
@@ -56,15 +58,17 @@ namespace ZwayBot.Moduls {
           }
         }
       }
-      foreach (String to in dictionary["to"].Split(';')) {
-        String[] target = to.Split(':');
-        if(target.Length == 2) {
-          ACommandClass c = this.zw.GetCommandClass(target[0]);
-          if (c != null) {
-            if (c.HasProperty(target[1])) {
-              if (c.GetProperty(target[1]).ToString() != source_value) {
-                c.SetProperty(target[1], source_value);
-                this.Update?.Invoke(this, new OvertakerEvent(target[0], target[1], source_value));
+      if (dictionary.ContainsKey("to")) {
+        foreach (String to in dictionary["to"].Split(';')) {
+          String[] target = to.Split(':');
+          if (target.Length == 2) {
+            ACommandClass c = this.zw.GetCommandClass(target[0]);
+            if (c != null) {
+              if (c.HasProperty(target[1])) {
+                if (c.GetProperty(target[1]).ToString() != source_value) {
+                  c.SetProperty(target[1], source_value);
+                  this.Update?.Invoke(this, new OvertakerEvent(target[0], target[1], source_value));
+                }
               }
             }
           }
@@ -72,6 +76,8 @@ namespace ZwayBot.Moduls {
       }
     }
 
+    protected override void UpdateConfig() { }
+
     #region IDisposable Support
     private Boolean disposedValue = false;
 
diff --git a/Zway-Bot/Zway-Bot/Moduls/StatusPolling.cs b/Zway-Bot/Zway-Bot/Moduls/StatusPolling.cs
index bcc3c7f..e53a781 100644
--- a/Zway-Bot/Zway-Bot/Moduls/StatusPolling.cs
+++ b/Zway-Bot/Zway-Bot/Moduls/StatusPolling.cs
@@ -17,10 +17,10 @@ namespace ZwayBot.Moduls {
       foreach (KeyValuePair<String, AModul> item in moduls) {
         if (item.Value is CronJob) {
           item.Value.SetInterconnection("0 0 * * *", new Action<Object>(this.PollAll), null);
-          if (this.ini != null) {
-            foreach (String section in this.ini.GetSections()) {
-              if (this.ini.GetValue(section, "cron") != null && this.ini.GetValue(section, "devices") != null) {
-                item.Value.SetInterconnection(this.ini.GetValue(section, "cron"), new Action<Object>(this.PollSpecific), this.ini.GetValue(section, "devices"));
+          if (this.config.Count != 0) {
+            foreach (KeyValuePair<String, Dictionary<String, String>> section in this.config) {
+              if (section.Value.ContainsKey("cron") && section.Value.ContainsKey("devices")) {
+                item.Value.SetInterconnection(section.Value["cron"], new Action<Object>(this.PollSpecific), section.Value["devices"]);
               }
             }
           }
@@ -53,6 +53,8 @@ namespace ZwayBot.Moduls {
       this.Update?.Invoke(this, new StatusPollingEvent("Polling", "all nodes"));
     }
 
+    protected override void UpdateConfig() { }
+
     public override void Dispose() {}
   }
 }
diff --git a/Zway-Bot/Zway-Bot/Properties/AssemblyInfo.cs b/Zway-Bot/Zway-Bot/Properties/AssemblyInfo.cs
index 975f0ad..3e625e0 100644
--- a/Zway-Bot/Zway-Bot/Properties/AssemblyInfo.cs
+++ b/Zway-Bot/Zway-Bot/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden
@@ -11,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Zway-Bot")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 22.12.2017")]
 [assembly: AssemblyTrademark("BlubbFish")]
 [assembly: AssemblyCulture("")]
 
@@ -33,8 +32,8 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
 [assembly: NeutralResourcesLanguage("de-DE")]
 
 // “Internet Of Things” icon by By Michael Wohlwend, US, from thenounproject.com.
diff --git a/Zway-Bot/Zway-Bot/Zway-Bot.csproj b/Zway-Bot/Zway-Bot/Zway-Bot.csproj
index 053fc03..32bab90 100644
--- a/Zway-Bot/Zway-Bot/Zway-Bot.csproj
+++ b/Zway-Bot/Zway-Bot/Zway-Bot.csproj
@@ -58,7 +58,6 @@
     <Compile Include="Moduls\AModul.cs" />
     <Compile Include="Moduls\CronJob.cs" />
     <Compile Include="Helper.cs" />
-    <Compile Include="Moduls\Flex4Grid.cs" />
     <Compile Include="Moduls\Mqtt.cs" />
     <Compile Include="Moduls\Overtaker.cs" />
     <Compile Include="Moduls\StatusPolling.cs" />
@@ -71,10 +70,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Utils\IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj">
-      <Project>{39235fad-ba9d-4b51-82fc-6969967beae9}</Project>
-      <Name>ConnectorDataMosquitto</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj">
       <Project>{ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2}</Project>
       <Name>ConnectorDataMqtt</Name>
diff --git a/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMosquitto.dll b/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMosquitto.dll
deleted file mode 100644
index ce671c5..0000000
Binary files a/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMosquitto.dll and /dev/null differ
diff --git a/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMqtt.dll b/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMqtt.dll
index 52d6034..eb2ebbb 100644
Binary files a/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMqtt.dll and b/Zway-Bot/Zway-Bot/bin/Release/ConnectorDataMqtt.dll differ
diff --git a/Zway-Bot/Zway-Bot/bin/Release/Utils-IoT.dll b/Zway-Bot/Zway-Bot/bin/Release/Utils-IoT.dll
index e569d45..bb4bdda 100644
Binary files a/Zway-Bot/Zway-Bot/bin/Release/Utils-IoT.dll and b/Zway-Bot/Zway-Bot/bin/Release/Utils-IoT.dll differ
diff --git a/Zway-Bot/Zway-Bot/bin/Release/Utils.dll b/Zway-Bot/Zway-Bot/bin/Release/Utils.dll
index b86be2c..8596b4d 100644
Binary files a/Zway-Bot/Zway-Bot/bin/Release/Utils.dll and b/Zway-Bot/Zway-Bot/bin/Release/Utils.dll differ
diff --git a/Zway-Bot/Zway-Bot/bin/Release/Zway-Bot.exe b/Zway-Bot/Zway-Bot/bin/Release/Zway-Bot.exe
index 378e85a..1804240 100644
Binary files a/Zway-Bot/Zway-Bot/bin/Release/Zway-Bot.exe and b/Zway-Bot/Zway-Bot/bin/Release/Zway-Bot.exe differ
diff --git a/Zway-Bot/Zway-Bot/bin/Release/Zway.dll b/Zway-Bot/Zway-Bot/bin/Release/Zway.dll
index fc9ccf3..991904e 100644
Binary files a/Zway-Bot/Zway-Bot/bin/Release/Zway.dll and b/Zway-Bot/Zway-Bot/bin/Release/Zway.dll differ
diff --git a/Zway/Zway/Devices/CommandClasses/Alarm.cs b/Zway/Zway/Devices/CommandClasses/Alarm.cs
new file mode 100644
index 0000000..f5e22c8
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/Alarm.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
+  /// <summary>
+  /// 135 = Indicator
+  /// </summary>
+  class Alarm : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Int32 Level { get; private set; }
+    public Int32 AlarmType { get; private set; }
+
+    public Alarm(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.InitComplex(json);
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("data") && json["data"].Keys.Contains("V1event") && 
+        json["data"]["V1event"].Keys.Contains("alarmType") && json["data"]["V1event"]["alarmType"].Keys.Contains("value") &&
+        json["data"]["V1event"].Keys.Contains("level") && json["data"]["V1event"]["level"].Keys.Contains("value")) {
+        this.AlarmType = Int32.Parse(json["data"]["V1event"]["alarmType"]["value"].ToString());
+        this.Level = Int32.Parse(json["data"]["V1event"]["level"]["value"].ToString());
+      }
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if(match.Groups[4].Value == ".data.V1event") {
+        if (json.Keys.Contains("alarmType") && json["alarmType"].Keys.Contains("value") &&
+          json.Keys.Contains("level") && json["level"].Keys.Contains("value") &&
+          this.CheckSetUpdateTime(json)) {
+          this.AlarmType = Int32.Parse(json["alarmType"]["value"].ToString());
+          this.Level = Int32.Parse(json["level"]["value"].ToString());
+          this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<Int32, Int32>(this.AlarmType, this.Level), this.LastUpdate, this));
+        }
+      } else {
+        Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
+      }
+    }
+
+    public override String ToString() {
+      return "Alarm " + this.Name + " [" + this.Id + "]: " + this.AlarmType + " " + this.Level;
+    }
+
+    internal override void Poll() => this.PollNone();
+
+    public override Dictionary<String, Object> ToDictionary() {
+      return new Dictionary<String, Object> {
+        { "AlarmType", this.AlarmType },
+        { "Level", this.Level },
+      };
+    }
+  }
+}
diff --git a/Zway/Zway/Devices/CommandClasses/AlarmSensor.cs b/Zway/Zway/Devices/CommandClasses/AlarmSensor.cs
new file mode 100644
index 0000000..d932efd
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/AlarmSensor.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
+  /// <summary>
+  /// 50 = Meter
+  /// </summary>
+  public class Alarmsensor : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Alarmsensor(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.HasSub = true;
+      this.InitComplex(json);
+      foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
+        item.Value.Update += this.DeviceUpdate;
+      }
+    }
+
+    private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
+      this.Update?.Invoke(this, e);
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (match.Groups[4].Value.StartsWith(".data.")) {
+        Int32 subid = Int32.Parse(match.Groups[5].Value);
+        if (this.Sub.ContainsKey(subid)) {
+          this.Sub[subid].SetUpdate(json, match);
+        }
+      } else {
+        Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
+      }
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("data")) {
+        JsonData data = json["data"];
+        Dictionary<Int32, ACommandClass> subs = new Dictionary<Int32, ACommandClass>();
+        foreach (String item in data.Keys) {
+          if (Int32.TryParse(item, out Int32 subid) &&
+            data[item].Keys.Contains("srcId") &&
+            data[item].Keys.Contains("sensorState") &&
+            data[item].Keys.Contains("sensorTime") &&
+            data[item].Keys.Contains("typeString")) {
+            subs.Add(subid, new Alarmsensorsub(data[item], new Tuple<Int32, Int32, Classes, Int32>(this.DeviceId, this.Instance, this.Commandclass, subid), this.http, this.Polling));
+          }
+        }
+        this.Sub = new ReadOnlyDictionary<Int32, ACommandClass>(subs);
+      }
+    }
+
+    internal override void Poll() => this.PollSubGlobal();
+
+    public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
+  }
+}
diff --git a/Zway/Zway/Devices/CommandClasses/Battery.cs b/Zway/Zway/Devices/CommandClasses/Battery.cs
index c7df38d..8a3c2c5 100644
--- a/Zway/Zway/Devices/CommandClasses/Battery.cs
+++ b/Zway/Zway/Devices/CommandClasses/Battery.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "Level", this.Level },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/CentralScene.cs b/Zway/Zway/Devices/CommandClasses/CentralScene.cs
index db4764b..9f2f67b 100644
--- a/Zway/Zway/Devices/CommandClasses/CentralScene.cs
+++ b/Zway/Zway/Devices/CommandClasses/CentralScene.cs
@@ -78,8 +78,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "scene", this.Scene },
-        { "key", this.Key },
+        { "Scene", this.Scene },
+        { "Key", this.Key },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Alarmsensorsub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Alarmsensorsub.cs
new file mode 100644
index 0000000..a6b2a42
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Alarmsensorsub.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
+  public class Alarmsensorsub : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Int32 Source { get; private set; }
+    public Int32 Level { get; private set; }
+    public Int32 Time { get; private set; }
+    public String Type { get; private set; }
+
+    public Alarmsensorsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.IsSub = true;
+      InitComplex(json);
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("srcId") && json["srcId"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorState") && json["sensorState"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorTime") && json["sensorTime"].Keys.Contains("value") &&
+        json.Keys.Contains("typeString") && json["typeString"].Keys.Contains("value")) {
+        this.Source = Int32.Parse(json["srcId"]["value"].ToString());
+        this.Level = Int32.Parse(json["sensorState"]["value"].ToString());
+        this.Time = Int32.Parse(json["sensorTime"]["value"].ToString());
+        this.Type = json["typeString"]["value"].ToString();
+      }
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (json.Keys.Contains("srcId") && json["srcId"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorState") && json["sensorState"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorTime") && json["sensorTime"].Keys.Contains("value") &&
+        json.Keys.Contains("typeString") && json["typeString"].Keys.Contains("value") && 
+        this.CheckSetUpdateTime(json)) {
+        this.Source = Int32.Parse(json["srcId"]["value"].ToString());
+        this.Level = Int32.Parse(json["sensorState"]["value"].ToString());
+        this.Time = Int32.Parse(json["sensorTime"]["value"].ToString());
+        this.Type = json["typeString"]["value"].ToString();
+        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<Int32, Int32, Int32, String>(this.Source, this.Level, this.Time, this.Type), this.LastUpdate, this));
+      }
+    }
+
+    public override String ToString() {
+      return "AlarmSensor " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Source + " " + this.Level + " " + this.Time + " " + this.Type;
+    }
+
+    internal override void Poll() => this.PollNone();
+
+    public override Dictionary<String, Object> ToDictionary() {
+      return new Dictionary<String, Object> {
+        { "Source", this.Source },
+        { "Level", this.Level },
+        { "Time", this.Time },
+        { "Type", this.Type }
+      };
+    }
+  }
+}
\ No newline at end of file
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
index fe83f28..e8e7737 100644
--- a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
@@ -61,8 +61,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "size", this.Size },
+        { "Level", this.Level },
+        { "Size", this.Size },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
index a4aa3c2..4ccc0c9 100644
--- a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
@@ -52,9 +52,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SceneControllerConfSub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SceneControllerConfSub.cs
new file mode 100644
index 0000000..da87c42
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SceneControllerConfSub.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
+  public class Scenecontrollerconfsub : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Int32 Scene { get; private set; }
+    public Int32 Duration { get; private set; }
+    public Scenecontrollerconfsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.IsSub = true;
+      InitComplex(json);
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("scene") && json["scene"].Keys.Contains("value") &&
+        json.Keys.Contains("duration") && json["duration"].Keys.Contains("value")) {
+        this.Scene = Int32.Parse(json["scene"]["value"].ToString());
+        this.Duration = Int32.Parse(json["duration"]["value"].ToString());
+      }
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (json.Keys.Contains("scene") && json["scene"].Keys.Contains("value") &&
+          json.Keys.Contains("duration") && json["duration"].Keys.Contains("value") &&
+          this.CheckSetUpdateTime(json)) {
+        this.Scene = Int32.Parse(json["scene"]["value"].ToString());
+        this.Duration = Int32.Parse(json["duration"]["value"].ToString());
+        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<Int32, Int32>(this.Scene, this.Duration), this.LastUpdate, this));
+      }
+    }
+
+    public override String ToString() {
+      return "SceneControllerConf " + this.Name + " [" + this.Id + "]: " + this.Scene + " " + this.Duration;
+    }
+
+    internal override void Poll() => this.PollSub();
+
+    public override Dictionary<String, Object> ToDictionary() {
+      return new Dictionary<String, Object> {
+        { "Scene", this.Scene },
+        { "Duration", this.Duration }
+      };
+    }
+  }
+}
\ No newline at end of file
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorBinarySub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorBinarySub.cs
new file mode 100644
index 0000000..b020a6c
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorBinarySub.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
+  public class Sensorbinarysub : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public String Type { get; private set; }
+    public Boolean State { get; private set; }
+    public Int32 Level {
+      get {
+        return (this.State) ? 1 : 0;
+      }
+    }
+
+    public Sensorbinarysub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.IsSub = true;
+      InitComplex(json);
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("sensorTypeString") &&
+        json["sensorTypeString"].Keys.Contains("value") &&
+        json.Keys.Contains("level") &&
+        json["level"].Keys.Contains("value")) {
+        this.Type = json["sensorTypeString"]["value"].ToString();
+        this.State = (Boolean)json["level"]["value"];
+      }
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (json.Keys.Contains("level") && json["level"].Keys.Contains("value") &&
+          json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") &&
+          this.CheckSetUpdateTime(json)) {
+        this.State = (Boolean)json["level"]["value"];
+        this.Type = json["sensorTypeString"]["value"].ToString();
+        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<String, Boolean>(this.Type, this.State), this.LastUpdate, this));
+      }
+    }
+
+    public override String ToString() {
+      return "SensorBinary " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.State.ToString();
+    }
+
+    internal override void Poll() => this.PollNone();
+
+    public override Dictionary<String, Object> ToDictionary() {
+      return new Dictionary<String, Object> {
+        { "State", this.State },
+        { "Type", this.Type },
+        { "Level", this.Level }
+      };
+    }
+  }
+}
\ No newline at end of file
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
index 52001d0..c2da824 100644
--- a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
@@ -33,6 +33,15 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
     }
 
     internal override void SetUpdate(JsonData json, Match match) {
+      if(json.Keys.Contains("val") && json["val"].Keys.Contains("value") && json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value")) {
+        String t = json["sensorTypeString"]["value"].ToString();
+        Double l = Double.Parse(json["val"]["value"].ToString());
+        if (t == "Power" && (l > 3660 || l < 0) ||
+          t == "Temperature" && (l > 65 || l < -25) ||
+          (t == "Temperature" && this.Level >= 4 && l == 0)) {
+          return;
+        }
+      }
       if(json.Keys.Contains("val") && json["val"].Keys.Contains("value") &&
           json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") &&
           json.Keys.Contains("scaleString") && json["scaleString"].Keys.Contains("value") && 
@@ -52,9 +61,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
index 85ec304..552eb28 100644
--- a/Zway/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
+++ b/Zway/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
@@ -82,12 +82,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
-        { "tempmax", this.TempMax },
-        { "tempmin", this.TempMin },
-        { "hasminmax", this.HasMinMax },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
+        { "TempMax", this.TempMax },
+        { "TempMin", this.TempMin },
+        { "HasMinMax", this.HasMinMax },
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/Indicator.cs b/Zway/Zway/Devices/CommandClasses/Indicator.cs
index 9cb15ab..e7dcca7 100644
--- a/Zway/Zway/Devices/CommandClasses/Indicator.cs
+++ b/Zway/Zway/Devices/CommandClasses/Indicator.cs
@@ -11,33 +11,42 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
   /// 135 = Indicator
   /// </summary>
   class Indicator : ACommandClass {
-    private Boolean _level;
+    private Boolean _state;
 
     public override event UpdatedValue Update;
-    public Boolean Level {
+    public Boolean State {
       get {
-        return this._level;
+        return this._state;
       }
       set {
         this.SetInt(value ? 255 : 0);
       }
     }
 
+    public Int32 Level {
+      get {
+        return (this.State) ? 1 : 0;
+      }
+      set {
+        this.State = (value == 1);
+      }
+    }
+
     public Indicator(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
       this.InitComplex(json);
     }
 
     private void InitComplex(JsonData json) {
       if (json.Keys.Contains("data") && json["data"].Keys.Contains("stat") && json["data"]["stat"].Keys.Contains("value")) {
-        this._level = Int32.Parse(json["data"]["stat"]["value"].ToString()) == 255;
+        this._state = Int32.Parse(json["data"]["stat"]["value"].ToString()) == 255;
       }
     }
 
     internal override void SetUpdate(JsonData json, Match match) {
       if(match.Groups[4].Value == ".data.stat") {
         if (json.Keys.Contains("value") && this.CheckSetUpdateTime(json)) {
-          this._level = Int32.Parse(json["value"].ToString()) == 255;
-          this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
+          this._state = Int32.Parse(json["value"].ToString()) == 255;
+          this.Update?.Invoke(this, new DeviceUpdateEvent(this.State, this.LastUpdate, this));
         }
       } else {
         Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
@@ -45,12 +54,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     }
 
     public override String ToString() {
-      return "Indicator " + this.Name + " [" + this.Id + "]: " + this.Level;
+      return "Indicator " + this.Name + " [" + this.Id + "]: " + this.State;
     }
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "State", this.State },
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/SceneControllerConf.cs b/Zway/Zway/Devices/CommandClasses/SceneControllerConf.cs
new file mode 100644
index 0000000..bbd0cfb
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/SceneControllerConf.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
+  /// <summary>
+  /// 50 = Meter
+  /// </summary>
+  public class Scenecontrollerconf : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Scenecontrollerconf(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.HasSub = true;
+      this.InitComplex(json);
+      foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
+        item.Value.Update += this.DeviceUpdate;
+      }
+    }
+
+    private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
+      this.Update?.Invoke(this, e);
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (match.Groups[4].Value.StartsWith(".data.")) {
+        Int32 subid = Int32.Parse(match.Groups[5].Value);
+        if (this.Sub.ContainsKey(subid)) {
+          this.Sub[subid].SetUpdate(json, match);
+        }
+      } else {
+        Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
+      }
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("data")) {
+        JsonData data = json["data"];
+        Dictionary<Int32, ACommandClass> subs = new Dictionary<Int32, ACommandClass>();
+        foreach (String item in data.Keys) {
+          if (Int32.TryParse(item, out Int32 subid) &&
+            data[item].Keys.Contains("scene") &&
+            data[item].Keys.Contains("duration")) {
+            subs.Add(subid, new Scenecontrollerconfsub(data[item], new Tuple<Int32, Int32, Classes, Int32>(this.DeviceId, this.Instance, this.Commandclass, subid), this.http, this.Polling));
+          }
+        }
+        this.Sub = new ReadOnlyDictionary<Int32, ACommandClass>(subs);
+      }
+    }
+
+    internal override void Poll() => this.PollPerSub();
+
+    public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
+  }
+}
diff --git a/Zway/Zway/Devices/CommandClasses/SensorBinary.cs b/Zway/Zway/Devices/CommandClasses/SensorBinary.cs
new file mode 100644
index 0000000..eb837ce
--- /dev/null
+++ b/Zway/Zway/Devices/CommandClasses/SensorBinary.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
+  /// <summary>
+  /// 48 = SensorBinary
+  /// </summary>
+  public class Sensorbinary : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Sensorbinary(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.HasSub = true;
+      this.InitComplex(json);
+      foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
+        item.Value.Update += this.DeviceUpdate;
+      }
+    }
+
+    private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
+      this.Update?.Invoke(this, e);
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (match.Groups[4].Value.StartsWith(".data.")) {
+        Int32 subid = Int32.Parse(match.Groups[5].Value);
+        if (this.Sub.ContainsKey(subid)) {
+          this.Sub[subid].SetUpdate(json, match);
+        }
+      } else {
+        Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
+      }
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("data")) {
+        JsonData data = json["data"];
+        Dictionary<Int32, ACommandClass> subs = new Dictionary<Int32, ACommandClass>();
+        foreach (String item in data.Keys) {
+          if (Int32.TryParse(item, out Int32 subid) &&
+            data[item].Keys.Contains("sensorTypeString") &&
+            data[item].Keys.Contains("level")) {
+            subs.Add(subid, new Sensorbinarysub(data[item], new Tuple<Int32, Int32, Classes, Int32>(this.DeviceId, this.Instance, this.Commandclass, subid), this.http, this.Polling));
+          }
+        }
+        this.Sub = new ReadOnlyDictionary<Int32, ACommandClass>(subs);
+      }
+    }
+
+    internal override void Poll() => this.PollSubGlobal();
+
+    public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
+  }
+}
diff --git a/Zway/Zway/Devices/CommandClasses/SwitchBinary.cs b/Zway/Zway/Devices/CommandClasses/SwitchBinary.cs
index a2d7dbb..ebe1d20 100644
--- a/Zway/Zway/Devices/CommandClasses/SwitchBinary.cs
+++ b/Zway/Zway/Devices/CommandClasses/SwitchBinary.cs
@@ -11,13 +11,22 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
   /// 37 = SwitchBinary
   /// </summary>
   public class Switchbinary : ACommandClass {
-    private Boolean _level;
+    private Boolean _state;
 
     public override event UpdatedValue Update;
 
-    public Boolean Level {
+    public Int32 Level {
       get {
-        return this._level;
+        return (this.State) ? 1 : 0;
+      }
+      set {
+        this.State = (value == 1);
+      }
+    }
+
+    public Boolean State {
+      get {
+        return this._state;
       }
       set {
         this.SetInt(value ? 255 : 0);
@@ -31,8 +40,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     internal override void SetUpdate(JsonData json, Match match) {
       if(match.Groups[4].Value == ".data.level") {
         if (json.Keys.Contains("value") && json["value"].IsBoolean && this.CheckSetUpdateTime(json)) {
-          this._level = (Boolean)json["value"];
-          this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
+          this._state = (Boolean)json["value"];
+          this.Update?.Invoke(this, new DeviceUpdateEvent(this.State, this.LastUpdate, this));
         }
       }  else {
         Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
@@ -41,17 +50,18 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     private void InitComplex(JsonData json) {
       if (json.Keys.Contains("data") && json["data"].Keys.Contains("level") && json["data"]["level"].Keys.Contains("value") && json["data"]["level"]["value"].IsBoolean) {
-        this._level = (Boolean)json["data"]["level"]["value"];
+        this._state = (Boolean)json["data"]["level"]["value"];
       }
     }
 
     public override String ToString() {
-      return "SwitchBinary " + this.Name + " [" + this.Id + "]: " + this.Level;
+      return "SwitchBinary " + this.Name + " [" + this.Id + "]: " + this.State;
     }
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "State", this.State },
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/SwitchMultilevel.cs b/Zway/Zway/Devices/CommandClasses/SwitchMultilevel.cs
index dcb3069..1f1cc22 100644
--- a/Zway/Zway/Devices/CommandClasses/SwitchMultilevel.cs
+++ b/Zway/Zway/Devices/CommandClasses/SwitchMultilevel.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Zway/Devices/CommandClasses/ThermostatMode.cs b/Zway/Zway/Devices/CommandClasses/ThermostatMode.cs
index 09f41ba..ddfa393 100644
--- a/Zway/Zway/Devices/CommandClasses/ThermostatMode.cs
+++ b/Zway/Zway/Devices/CommandClasses/ThermostatMode.cs
@@ -71,8 +71,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         modes.Add(item.Key.ToString(), item.Value);
       }
       Dictionary<String, Object> json = new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "modes", modes }
+        { "Level", this.Level },
+        { "ValidModes", modes }
       };
       return json;
     }
diff --git a/Zway/Zway/Devices/CommandClasses/Wakeup.cs b/Zway/Zway/Devices/CommandClasses/Wakeup.cs
index 016c740..22609f0 100644
--- a/Zway/Zway/Devices/CommandClasses/Wakeup.cs
+++ b/Zway/Zway/Devices/CommandClasses/Wakeup.cs
@@ -34,7 +34,11 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     }
     public Int32 WakeupMin { get; private set; }
     public Int32 WakeupMax { get; private set; }
+    public Boolean HasMinMaxState { get; private set; }
+    public Int32 HasMinMaxLevel { get { return (this.HasMinMaxState) ? 1 : 0; } }
     public Int32 WakeupDefault { get; private set; }
+    public Boolean HasDefaultState { get; private set; }
+    public Int32 HasDefaultLevel { get { return (this.HasDefaultState) ? 1 : 0; } }
     public DateTime LastWakeup { get; private set; }
     public DateTime LastSleep { get; private set; }
 
@@ -51,19 +55,24 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         if (data.Keys.Contains("nodeId") && data["nodeId"].Keys.Contains("value")) {
           this._againstNode = Int32.Parse(data["nodeId"]["value"].ToString());
         }
-        if (data.Keys.Contains("min") && data["min"].Keys.Contains("value")) {
+        this.HasMinMaxState = false;
+        if (data.Keys.Contains("min") && data["min"].Keys.Contains("value") && data["min"]["value"] != null) {
           this.WakeupMin = Int32.Parse(data["min"]["value"].ToString());
+          this.HasMinMaxState = true;
         }
-        if (data.Keys.Contains("max") && data["max"].Keys.Contains("value")) {
+        if (data.Keys.Contains("max") && data["max"].Keys.Contains("value") && data["max"]["value"] != null) {
           this.WakeupMax = Int32.Parse(data["max"]["value"].ToString());
+          this.HasMinMaxState = true;
         }
-        if (data.Keys.Contains("default") && data["default"].Keys.Contains("value")) {
+        this.HasDefaultState = false;
+        if (data.Keys.Contains("default") && data["default"].Keys.Contains("value") && data["default"]["value"] != null) {
           this.WakeupDefault = Int32.Parse(data["default"]["value"].ToString());
+          this.HasDefaultState = true;
         }
-        if (data.Keys.Contains("lastWakeup") && data["lastWakeup"].Keys.Contains("value")) {
+        if (data.Keys.Contains("lastWakeup") && data["lastWakeup"].Keys.Contains("value") && data["lastWakeup"]["value"] != null) {
           this.LastWakeup = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(data["lastWakeup"]["value"].ToString())).DateTime.ToLocalTime();
         }
-        if (data.Keys.Contains("lastSleep") && data["lastSleep"].Keys.Contains("value")) {
+        if (data.Keys.Contains("lastSleep") && data["lastSleep"].Keys.Contains("value") && data["lastSleep"]["value"] != null) {
           this.LastSleep = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(data["lastSleep"]["value"].ToString())).DateTime.ToLocalTime();
         }
       }
@@ -90,23 +99,28 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
           this._againstNode = Int32.Parse(json["nodeId"]["value"].ToString());
           success = true;
         }
-        if (json.Keys.Contains("min") && json["min"].Keys.Contains("value")) {
+        this.HasMinMaxState = false;
+        if (json.Keys.Contains("min") && json["min"].Keys.Contains("value") && json["min"]["value"] != null) {
           this.WakeupMin = Int32.Parse(json["min"]["value"].ToString());
           success = true;
+          this.HasMinMaxState = true;
         }
-        if (json.Keys.Contains("max") && json["max"].Keys.Contains("value")) {
+        if (json.Keys.Contains("max") && json["max"].Keys.Contains("value") && json["max"]["value"] != null) {
           this.WakeupMax = Int32.Parse(json["max"]["value"].ToString());
           success = true;
+          this.HasMinMaxState = true;
         }
-        if (json.Keys.Contains("default") && json["default"].Keys.Contains("value")) {
+        this.HasDefaultState = false;
+        if (json.Keys.Contains("default") && json["default"].Keys.Contains("value") && json["default"]["value"] != null) {
           this.WakeupDefault = Int32.Parse(json["default"]["value"].ToString());
           success = true;
+          this.HasDefaultState = true;
         }
-        if (json.Keys.Contains("lastWakeup") && json["lastWakeup"].Keys.Contains("value")) {
+        if (json.Keys.Contains("lastWakeup") && json["lastWakeup"].Keys.Contains("value") && json["lastWakeup"]["value"] != null) {
           this.LastWakeup = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(json["lastWakeup"]["value"].ToString())).DateTime.ToLocalTime();
           success = true;
         }
-        if (json.Keys.Contains("lastSleep") && json["lastSleep"].Keys.Contains("value")) {
+        if (json.Keys.Contains("lastSleep") && json["lastSleep"].Keys.Contains("value") && json["lastSleep"]["value"] != null) {
           this.LastSleep = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(json["lastSleep"]["value"].ToString())).DateTime.ToLocalTime();
           success = true;
         }
@@ -124,13 +138,17 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        {"interval", this.Interval },
-        {"againstnode", this.AgainstNode },
-        { "wakeupmin", this.WakeupMin },
-        { "wakeupmax", this.WakeupMax },
-        { "wakeupdefault", this.WakeupDefault },
-        { "lastwakeup", this.LastWakeup.ToString() },
-        { "lastsleep", this.LastSleep.ToString() }
+        { "Interval", this.Interval },
+        { "AgainstNode", this.AgainstNode },
+        { "WakeupMin", this.WakeupMin },
+        { "WakeupMax", this.WakeupMax },
+        { "HasMinMaxState", this.HasMinMaxState },
+        { "HasMinMaxLevel", this.HasMinMaxLevel },
+        { "WakeupDefault", this.WakeupDefault },
+        { "HasDefaultState", this.HasDefaultState },
+        { "HasDefaultLevel", this.HasDefaultLevel },
+        { "LastWakeup", this.LastWakeup.ToString() },
+        { "LastSleep", this.LastSleep.ToString() }
       };
     }
   }
diff --git a/Zway/Zway/Events/DeviceUpdateEvent.cs b/Zway/Zway/Events/DeviceUpdateEvent.cs
index 78c5938..731e0ab 100644
--- a/Zway/Zway/Events/DeviceUpdateEvent.cs
+++ b/Zway/Zway/Events/DeviceUpdateEvent.cs
@@ -10,55 +10,14 @@ namespace BlubbFish.IoT.Zway.Events {
     public DeviceUpdateEvent() {
     }
 
-    public DeviceUpdateEvent(Double value, DateTime time, Object parent) {
-      this.GetDouble = value;
+    public DeviceUpdateEvent(Object value, DateTime time, Object parent) {
+      this.GetValue = value;
       this.UpdateTime = time;
       this.Parent = parent;
     }
 
-    public DeviceUpdateEvent(Boolean value, DateTime time, Object parent) {
-      this.GetBoolean = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-
-    public DeviceUpdateEvent(DateTime value, DateTime time, Object parent) {
-      this.GetDate = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-
-    public DeviceUpdateEvent(Tuple<String, String, Double> value, DateTime time, Object parent) {
-      this.GetStringStringDoubleTuple = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-    public DeviceUpdateEvent(Tuple<String, String, Double, Double, Double, Boolean> value, DateTime time, Object parent) {
-      this.GetStringStringDoubleDoubleDoubleDoubleBooleanTuple = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-
-    public DeviceUpdateEvent(Tuple<Int32, Int32> value, DateTime time, Object parent) {
-      this.GetIntegerTuple = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-
-    public DeviceUpdateEvent(Tuple<Int64, Int32> value, DateTime time, Object parent) {
-      this.GetLongIntegerTuple = value;
-      this.UpdateTime = time;
-      this.Parent = parent;
-    }
-
-    public Double GetDouble { get; }
-    public DateTime GetDate { get; }
-    public Tuple<String, String, Double> GetStringStringDoubleTuple { get; }
-    public Tuple<String, String, Double, Double, Double, Boolean> GetStringStringDoubleDoubleDoubleDoubleBooleanTuple { get; }
-    public Tuple<Int64, Int32> GetLongIntegerTuple { get; }
+    public Object GetValue { get; }
     public DateTime UpdateTime { get;  }
     public Object Parent { get; private set; }
-    public Boolean GetBoolean { get; }
-    public Tuple<Int32,Int32> GetIntegerTuple { get; }
   }
 }
\ No newline at end of file
diff --git a/Zway/Zway/Interfaces/ACommandClass.cs b/Zway/Zway/Interfaces/ACommandClass.cs
index 05cb788..a9328c4 100644
--- a/Zway/Zway/Interfaces/ACommandClass.cs
+++ b/Zway/Zway/Interfaces/ACommandClass.cs
@@ -16,11 +16,17 @@ namespace BlubbFish.IoT.Zway.Interfaces {
       Basic = 32,
       ControllerReplication = 33,
       ApplicationStatus = 34,
-      SensorBinary = 48,
+      SwitchAll = 39,
+      SceneActivation = 43,
       SwitchColor = 51,
       MeterPulse = 53,
+      MeterTableMonitor = 61,
+      CRC16 = 86,
+      AssociationGroupInformation = 89,
+      DeviceResetLocally = 90,
+      ZWavePlusInfo = 94,
       MultiChannel = 96,
-      Alarm = 113,
+      DoorLock = 98,
       ManufacturerSpecific = 114,
       PowerLevel = 115,
       Protection = 117,
@@ -28,22 +34,28 @@ namespace BlubbFish.IoT.Zway.Interfaces {
       FirmwareUpdate = 122,
       Association = 133,
       Version = 134,
+      Proprietary = 136,
       MultiChannelAssociation = 142,
-      MultiCmd = 143
+      MultiCmd = 143,
+      Security = 152
     }
 
     public enum Classes : Int32 {
       SwitchBinary = 37,
       SwitchMultilevel = 38,
+      SceneControllerConf = 45, 
+      SensorBinary = 48,
       SensorMultilevel = 49,
       Meter = 50,
       ThermostatMode = 64,
       ThermostatSetPoint = 67,
       CentralScene = 91,
       Configuration = 112,
+      Alarm = 113,
       Battery = 128,
       Wakeup = 132,
-      Indicator = 135
+      Indicator = 135,
+      AlarmSensor = 156
     }
 
     public Int32 DeviceId { get; }
@@ -153,13 +165,16 @@ namespace BlubbFish.IoT.Zway.Interfaces {
 
     protected void PollSubGlobal() {
       Boolean poll = false;
+      Boolean pollonce = false;
       foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
         if (item.Value.Polling) {
           poll = true;
-          break;
+        }
+        if(item.Value.PollOnce) {
+          pollonce = true;
         }
       }
-      if (poll) {
+      if (poll || pollonce) {
         this.http.GetVoid("ZWave.zway/Run/devices[" + this.DeviceId + "].instances[" + this.Instance + "].commandClasses[" + ((Int32)this.Commandclass).ToString() + "].Get()");
       }
     }
@@ -210,9 +225,9 @@ namespace BlubbFish.IoT.Zway.Interfaces {
 
     public String ToJson() {
       Dictionary<String, Object> json = this.ToDictionary();
-      json.Add("date", this.LastUpdate.ToString());
-      json.Add("name", this.Name);
-      json.Add("class", this.Commandclass.ToString());
+      json.Add("LastUpdate", this.LastUpdate.ToString());
+      json.Add("Name", this.Name);
+      json.Add("Commandclass", this.Commandclass.ToString());
       return JsonMapper.ToJson(json);
     }
 
diff --git a/Zway/Zway/Properties/AssemblyInfo.cs b/Zway/Zway/Properties/AssemblyInfo.cs
index a4e2ce0..396235d 100644
--- a/Zway/Zway/Properties/AssemblyInfo.cs
+++ b/Zway/Zway/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Zway")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 01.01.2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.3.6.0")]
+[assembly: AssemblyFileVersion("1.3.6.0")]
diff --git a/Zway/Zway/Zway.csproj b/Zway/Zway/Zway.csproj
index 6da4ab8..ffafd7e 100644
--- a/Zway/Zway/Zway.csproj
+++ b/Zway/Zway/Zway.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.IoT.Zway</RootNamespace>
     <AssemblyName>Zway</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\IoT-Bot\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
+      <HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -43,14 +44,21 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Devices\CommandClasses\Alarm.cs" />
     <Compile Include="Devices\CommandClasses\Battery.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\Configurationsub.cs" />
+    <Compile Include="Devices\CommandClasses\CommandClassSubs\Alarmsensorsub.cs" />
+    <Compile Include="Devices\CommandClasses\CommandClassSubs\SceneControllerConfSub.cs" />
+    <Compile Include="Devices\CommandClasses\CommandClassSubs\SensorBinarySub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\ThermostatSetPointSub.cs" />
     <Compile Include="Devices\CommandClasses\Configuration.cs" />
     <Compile Include="Devices\CommandClasses\Indicator.cs" />
+    <Compile Include="Devices\CommandClasses\AlarmSensor.cs" />
     <Compile Include="Devices\CommandClasses\Meter.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\MeterSub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\SensorMultilevelSub.cs" />
+    <Compile Include="Devices\CommandClasses\SceneControllerConf.cs" />
+    <Compile Include="Devices\CommandClasses\SensorBinary.cs" />
     <Compile Include="Devices\CommandClasses\Wakeup.cs" />
     <Compile Include="Devices\Device.cs" />
     <Compile Include="Interfaces\ACommandClass.cs" />
@@ -71,6 +79,5 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Zway/Zway/ZwayController.cs b/Zway/Zway/ZwayController.cs
index 00467ce..5734607 100644
--- a/Zway/Zway/ZwayController.cs
+++ b/Zway/Zway/ZwayController.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
-using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
 using BlubbFish.IoT.Zway.Devices;
diff --git a/Zway/Zway/bin/Release/Zway.dll b/Zway/Zway/bin/Release/Zway.dll
index fc9ccf3..991904e 100644
Binary files a/Zway/Zway/bin/Release/Zway.dll and b/Zway/Zway/bin/Release/Zway.dll differ
diff --git a/Zway/Zway/packages.config b/Zway/Zway/packages.config
index eb9ba23..302ea4e 100644
--- a/Zway/Zway/packages.config
+++ b/Zway/Zway/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LitJson" version="0.9.0" targetFramework="net461" />
+  <package id="LitJson" version="0.9.0" targetFramework="net471" />
 </packages>
\ No newline at end of file