diff --git a/Icon.png b/Icon.png
index 5db0375..1dc39dd 100644
Binary files a/Icon.png and b/Icon.png differ
diff --git a/README.md b/README.md
index 57fc772..dc304d6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![NuGet Badge](https://buildstats.info/nuget/Raspberry.System3)](https://www.nuget.org/packages/Raspberry.System3/)[![Build status](https://ci.appveyor.com/api/projects/status/d9bswf8kwk484tva?svg=true)](https://ci.appveyor.com/project/JTrotta/raspberry-sharp-system) [![BCH compliance](https://bettercodehub.com/edge/badge/JTrotta/raspberry-sharp-system?branch=master)](https://bettercodehub.com/)
+
 Raspberry# System
 =================
 
@@ -15,8 +17,8 @@ Features
 
 ### Raspberry.System
 Raspberry.System provides utilities for Raspberry Pi boards, while using .NET concepts, syntax and case.
-You can easily add a reference to it in your Visual Studio projects using the **[Raspberry.System Nuget](https://www.nuget.org/packages/Raspberry.System)**.
+You can easily add a reference to it in your Visual Studio projects using the **[Raspberry.System Nuget](https://www.nuget.org/packages/Raspberry.System3)**.
 
 It currently support the following features:
 + Automatic detection of various Raspberry Pi revisions, as of 2013-09, **Raspberry Pi model B rev1 and rev2 and Raspberry Pi model A**
-+ High resolution (about 1µs) timers
++ High resolution (about 1µs) timers
diff --git a/Raspberry.System.3.0.0.nupkg b/Raspberry.System.3.0.0.nupkg
new file mode 100644
index 0000000..0539e37
Binary files /dev/null and b/Raspberry.System.3.0.0.nupkg differ
diff --git a/Raspberry.System.nuspec b/Raspberry.System.nuspec
deleted file mode 100644
index 23ffa1d..0000000
--- a/Raspberry.System.nuspec
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Raspberry.System</id>
-    <version>0.0.0</version>
-    <title>Raspberry.System</title>
-    <authors>Eric Bézine</authors>
-    <owners>Raspberry-Sharp</owners>
-    <licenseUrl>http://opensource.org/licenses/GPL-2.0</licenseUrl>
-    <projectUrl>https://github.com/raspberry-sharp/raspberry-sharp-system/wiki</projectUrl>
-    <iconUrl>https://raw.github.com/raspberry-sharp/raspberry-sharp-system/master/Icon.png</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>
-      Raspberry.System is a Mono/.NET assembly providing access to Raspberry Pi system features.
-
-      It is an initiative of the Raspberry# Community, aimed at providing tools and information concerning use of Raspberry Pi boards with Mono/.NET framework.
-      Visit project [Github site](https://github.com/raspberry-sharp/raspberry-sharp-system/) for documentation and samples.
-    </description>
-    <summary>Raspberry.System is a Mono/.NET assembly providing access to Raspberry Pi system features.</summary>
-    <language>en-US</language>
-    <tags>Raspberry Pi Mono System Timers</tags>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net40" />
-    </frameworkAssemblies>
-  </metadata>
-  <files>
-    <file src="Raspberry.System\bin\release\Raspberry.System.dll" target="lib\net40" />
-    <file src="Raspberry.System\bin\release\Raspberry.System.pdb" target="lib\net40" />
-    <file src="Raspberry.System\bin\release\Raspberry.System.xml" target="lib\net40" />
-    <file src="Raspberry.System\**\*.cs" target="src" />
-  </files>
-</package>
diff --git a/Raspberry.System/Board.cs b/Raspberry.System/Board.cs
index 4595242..3dfb13e 100644
--- a/Raspberry.System/Board.cs
+++ b/Raspberry.System/Board.cs
@@ -243,9 +243,15 @@ private Model LoadModel()
                 case 0x0093:
                     return Model.Zero;
 
+                case 0x00C1:
+                    return Model.ZeroW;
+
                 case 0x2082:
                     return Model.B3;
-
+                    
+                case 0x20A0:
+                    return Model.ComputeModule3;
+                    
                 default:
                     return Model.Unknown;
             }
@@ -268,6 +274,7 @@ private ConnectorPinout LoadConnectorPinout()
                 case Model.B2:
                 case Model.Zero:
                 case Model.B3:
+                case Model.ComputeModule3:                    
                     return ConnectorPinout.Plus;
 
                 default:
@@ -277,4 +284,4 @@ private ConnectorPinout LoadConnectorPinout()
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/Raspberry.System/Model.cs b/Raspberry.System/Model.cs
index c16174b..34db309 100644
--- a/Raspberry.System/Model.cs
+++ b/Raspberry.System/Model.cs
@@ -53,10 +53,20 @@ public enum Model
         /// </summary>
         Zero,
 
+        /// <summary>
+        /// Pi Zero W.
+        /// </summary>
+        ZeroW,
+
         /// <summary>
         /// Pi 3 Model B.
         /// </summary>
-        B3
+        B3,
+        
+        /// <summary>
+        /// Compute module 3.
+        /// </summary>
+        ComputeModule3,        
     }
 
     /// <summary>
@@ -91,12 +101,16 @@ public static string GetDisplayName(this Model model)
                     return "Raspberry Pi 2 Model B";
                 case Model.Zero:
                     return "Raspberry Pi Zero";
+                case Model.ZeroW:
+                    return "Raspberry Pi Zero W";
                 case Model.B3:
                     return "Raspberry Pi 3 Model B";
-
+                case Model.ComputeModule3:
+                    return "Raspberry Pi Compute Module 3";
+                    
                 default:
                     throw new ArgumentOutOfRangeException("model");
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Raspberry.System/Processor.cs b/Raspberry.System/Processor.cs
index 01e2b69..dc03a5f 100644
--- a/Raspberry.System/Processor.cs
+++ b/Raspberry.System/Processor.cs
@@ -18,6 +18,11 @@ public enum Processor
         /// <summary>
         /// Processor is a BCM2709.
         /// </summary>
-        Bcm2709
+        Bcm2709,
+
+        /// <summary>
+        /// Processor is BCM2835
+        /// </summary>
+        BCM2835 // <- added this one JJ FIX per RB3/CM3
     }
 }
\ No newline at end of file
diff --git a/Raspberry.System/Properties/AssemblyInfo.cs b/Raspberry.System/Properties/AssemblyInfo.cs
index e57f5af..99f53f9 100644
--- a/Raspberry.System/Properties/AssemblyInfo.cs
+++ b/Raspberry.System/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("3.1.1.0")]
+[assembly: AssemblyFileVersion("3.1.1.0")]