diff --git a/src/PiSharp.LibGpio/Entities/BroadcomPinNumber.cs b/src/PiSharp.LibGpio/Entities/BroadcomPinNumber.cs
index 57c4585..2a7023f 100644
--- a/src/PiSharp.LibGpio/Entities/BroadcomPinNumber.cs
+++ b/src/PiSharp.LibGpio/Entities/BroadcomPinNumber.cs
@@ -17,51 +17,159 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace PiSharp.LibGpio.Entities
+namespace PiSharp.LibGpio
 {
-    /// <summary>
-    /// The Broadcom GPIO ID
-    /// </summary>
-    public enum BroadcomPinNumber
+    public partial class LibGpio
     {
         /// <summary>
-        /// GPIO Pin 4
+        /// The Broadcom GPIO ID
         /// </summary>
-        Four = 4,
+        public enum BroadcomPinNumber
+        {
+            /// <summary>
+            /// GPIO Pin 0 (B Rev1 only)
+            /// </summary>   
+            Zero = 0,
 
-        /// <summary>
-        /// GPIO Pin 17
-        /// </summary>
-        Seventeen = 17,
+            /// <summary>
+            /// GPIO Pin 1 (B Rev1 only)
+            /// </summary>
+            One = 1,
 
-        /// <summary>
-        /// GPIO Pin 18
-        /// </summary>
-        Eighteen = 18,
+            /// <summary>
+            /// GPIO Pin 2 (A/B Rev2 and above)
+            /// </summary>
+            Two = 2,
 
-        /// <summary>
-        /// GPIO Pin 21
-        /// </summary>
-        TwentyOne = 21,
+            /// <summary>
+            /// GPIO Pin 3 (A/B Rev2 and above)
+            /// </summary>
+            Three = 3,
 
-        /// <summary>
-        /// GPIO Pin 22
-        /// </summary>
-        TwentyTwo = 22,
+            /// <summary>
+            /// GPIO Pin 4
+            /// </summary>
+            Four = 4,
 
-        /// <summary>
-        /// GPIO Pin 23
-        /// </summary>
-        TwentyThree = 23,
+            /// <summary>
+            /// GPIO Pin 5 (B+ and above)
+            /// </summary>
+            Five = 5,
 
-        /// <summary>
-        /// GPIO Pin 24
-        /// </summary>
-        TwentyFour = 24,
+            /// <summary>
+            /// GPIO Pin 6 (B+ and above)
+            /// </summary>
+            Six = 6,
 
-        /// <summary>
-        /// GPIO Pin 25
-        /// </summary>
-        TwentyFive = 25,
+            /// <summary>
+            /// GPIO Pin 7
+            /// </summary>
+            Seven = 7,
+
+            /// <summary>
+            /// GPIO Pin 8
+            /// </summary>
+            Eight = 8,
+
+            /// <summary>
+            /// GPIO Pin 9
+            /// </summary>
+            Nine = 9,
+
+            /// <summary>
+            /// GPIO Pin 10
+            /// </summary>
+            Ten = 10,
+
+            /// <summary>
+            /// GPIO Pin 11
+            /// </summary>
+            Eleven = 11,
+
+            /// <summary>
+            /// GPIO Pin 12 (B+ and above)
+            /// </summary>
+            Twelve = 12,
+
+            /// <summary>
+            /// GPIO Pin 13 (B+ and above)
+            /// </summary>
+            Thirteen = 13,
+
+            /// <summary>
+            /// GPIO Pin 14
+            /// </summary>
+            Fourteen = 14,
+
+            /// <summary>
+            /// GPIO Pin 15
+            /// </summary>
+            Fifteen = 15,
+
+            /// <summary>
+            /// GPIO Pin 16 (B+ and above)
+            /// </summary>
+            Sixteen = 16,
+
+            /// <summary>
+            /// GPIO Pin 17
+            /// </summary>
+            Seventeen = 17,
+
+            /// <summary>
+            /// GPIO Pin 18
+            /// </summary>
+            Eighteen = 18,
+
+            /// <summary>
+            /// GPIO Pin 19 (B+ and above)
+            /// </summary>
+            Nineteen = 19,
+
+            /// <summary>
+            /// GPIO Pin 20 (B+ and above)
+            /// </summary>
+            Twenty = 20,
+
+            /// <summary>
+            /// GPIO Pin 21 (Rev1)
+            /// </summary>
+            TwentyOne = 21,
+
+            /// <summary>
+            /// GPIO Pin 22
+            /// </summary>
+            TwentyTwo = 22,
+
+            /// <summary>
+            /// GPIO Pin 23
+            /// </summary>
+            TwentyThree = 23,
+
+            /// <summary>
+            /// GPIO Pin 24
+            /// </summary>
+            TwentyFour = 24,
+
+            /// <summary>
+            /// GPIO Pin 25
+            /// </summary>
+            TwentyFive = 25,
+
+            /// <summary>
+            /// GPIO Pin 26 (B+ and above)
+            /// </summary>
+            TwentySix = 26,
+
+            /// <summary>
+            /// GPIO Pin 27 (A/B Rev2 and above)
+            /// </summary>
+            TwentySeven = 27,
+
+            /// <summary>
+            /// Undefined pin number
+            /// </summary>
+            Undefined = -1
+        }
     }
 }
diff --git a/src/PiSharp.LibGpio/Entities/GpioLayout.cs b/src/PiSharp.LibGpio/Entities/GpioLayout.cs
new file mode 100644
index 0000000..c3dfcec
--- /dev/null
+++ b/src/PiSharp.LibGpio/Entities/GpioLayout.cs
@@ -0,0 +1,23 @@
+namespace PiSharp.LibGpio.Entities
+{
+    /// <summary>
+    /// The Raspberry Pi GPIO ID
+    /// </summary>
+    public enum GpioLayout
+    {
+        /// <summary>
+        /// Revision numbers : [Beta, 0003]
+        /// </summary>
+        LayoutOne = 1,
+
+        /// <summary>
+        /// Revision numbers : [0004, 000f]
+        /// </summary>
+        LayoutTwo = 2,
+
+        /// <summary>
+        /// Revision numbers : [0010, ...]
+        /// </summary>
+        LayoutThree = 3
+    }
+}
diff --git a/src/PiSharp.LibGpio/Entities/PhysicalPinNumber.cs b/src/PiSharp.LibGpio/Entities/PhysicalPinNumber.cs
index 0798cdd..a1619f4 100644
--- a/src/PiSharp.LibGpio/Entities/PhysicalPinNumber.cs
+++ b/src/PiSharp.LibGpio/Entities/PhysicalPinNumber.cs
@@ -29,11 +29,31 @@ public enum PhysicalPinNumber
         /// </summary>
         Undefined = 0,
 
+        /// <summary>
+        /// GPIO Pin 3
+        /// </summary>
+        Three = 3,
+
+        /// <summary>
+        /// GPIO Pin 5
+        /// </summary>
+        Five = 5,
+
         /// <summary>
         /// GPIO Pin 7
         /// </summary>
         Seven = 7,
 
+        /// <summary>
+        /// GPIO Pin 8
+        /// </summary>
+        Eight = 8,
+
+        /// <summary>
+        /// GPIO Pin 10
+        /// </summary>
+        Ten = 10,
+
         /// <summary>
         /// GPIO Pin 11
         /// </summary>
@@ -64,9 +84,80 @@ public enum PhysicalPinNumber
         /// </summary>
         Eighteen = 18,
 
+        /// <summary>
+        /// GPIO Pin 19
+        /// </summary>
+        Nineteen = 19,
+
+        /// <summary>
+        /// GPIO Pin 21
+        /// </summary>
+        TwentyOne = 21,
+
         /// <summary>
         /// GPIO Pin 22
         /// </summary>
-        TwentyTwo = 22
+        TwentyTwo = 22,
+
+        /// <summary>
+        /// GPIO Pin 23
+        /// </summary>
+        TwentyThree = 23,
+
+        /// <summary>
+        /// GPIO Pin 24
+        /// </summary>
+        TwentyFour = 24,
+
+        /// <summary>
+        /// GPIO Pin 26
+        /// </summary>
+        TwentySix = 26,
+
+        /// <summary>
+        /// GPIO Pin 29 (B+ and above)
+        /// </summary>
+        TwentyNine = 29,
+
+        /// <summary>
+        /// GPIO Pin 31 (B+ and above)
+        /// </summary>
+        ThirtyOne = 31,
+
+        /// <summary>
+        /// GPIO Pin 32 (B+ and above)
+        /// </summary>
+        ThirtyTwo = 32,
+
+        /// <summary>
+        /// GPIO Pin 33 (B+ and above)
+        /// </summary>
+        ThirtyThree = 33,
+
+        /// <summary>
+        /// GPIO Pin 35 (B+ and above)
+        /// </summary>
+        ThirtyFive = 35,
+
+        /// <summary>
+        /// GPIO Pin 36 (B+ and above)
+        /// </summary>
+        ThirtySix = 36,
+
+        /// <summary>
+        /// GPIO Pin 37 (B+ and above)
+        /// </summary>
+        ThirtySeven = 37,
+
+        /// <summary>
+        /// GPIO Pin 38 (B+ and above)
+        /// </summary>
+        ThirtyEight = 38,
+
+        /// <summary>
+        /// GPIO Pin 40 (B+ and above)
+        /// </summary>
+        Fourty = 40
+
     }
 }
diff --git a/src/PiSharp.LibGpio/Entities/RaspberryPinNumber.cs b/src/PiSharp.LibGpio/Entities/RaspberryPinNumber.cs
deleted file mode 100644
index be1720f..0000000
--- a/src/PiSharp.LibGpio/Entities/RaspberryPinNumber.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="RaspberryPinNumber.cs" company="Andrew Bradford">
-//     Copyright (C) 2012 Andrew Bradford
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
-//     associated documentation files (the "Software"), to deal in the Software without restriction, 
-//     including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-//     and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject 
-//     to the following conditions:
-//     
-//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//     
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE 
-//     WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-//     COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
-//     ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace PiSharp.LibGpio.Entities
-{
-    /// <summary>
-    /// The Raspberry Pi GPIO ID
-    /// </summary>
-    public enum RaspberryPinNumber
-    {
-        /// <summary>
-        /// Invalid pin number - used to established a known invalid value to un-initialised variables.
-        /// </summary>
-        Zero = 0,
-
-        /// <summary>
-        /// GPIO Pin 1
-        /// </summary>
-        One,
-
-        /// <summary>
-        /// GPIO Pin 2
-        /// </summary>
-        Two,
-
-        /// <summary>
-        /// GPIO Pin 3
-        /// </summary>
-        Three,
-
-        /// <summary>
-        /// GPIO Pin 4
-        /// </summary>
-        Four,
-
-        /// <summary>
-        /// GPIO Pin 5
-        /// </summary>
-        Five,
-
-        /// <summary>
-        /// GPIO Pin 6
-        /// </summary>
-        Six,
-
-        /// <summary>
-        /// GPIO Pin 7
-        /// </summary>
-        Seven,
-    }
-}
diff --git a/src/PiSharp.LibGpio/LibGpio.cs b/src/PiSharp.LibGpio/LibGpio.cs
index 5556495..1ff83ae 100644
--- a/src/PiSharp.LibGpio/LibGpio.cs
+++ b/src/PiSharp.LibGpio/LibGpio.cs
@@ -31,7 +31,7 @@ namespace PiSharp.LibGpio
     /// Library for interfacing with the Raspberry Pi GPIO ports. 
     /// This class is implemented as a singleton - no attempt should be made to instantiate it
     /// </summary>
-    public class LibGpio
+    public partial class LibGpio
     {
         /// <summary>
         /// Stores the singleton instance of the class
@@ -81,16 +81,6 @@ public bool TestMode
             set;
         }
 
-        /// <summary>
-        /// Configures a GPIO channel for use
-        /// </summary>
-        /// <param name="pinNumber">The Raspberry Pi pin number to configure</param>
-        /// <param name="direction">The direction to configure the pin for</param>
-        public void SetupChannel(RaspberryPinNumber pinNumber, Direction direction)
-        {
-            this.SetupChannel(ConvertToBroadcom(pinNumber), direction);
-        }
-
         /// <summary>
         /// Configures a GPIO channel for use
         /// </summary>
@@ -108,6 +98,11 @@ public void SetupChannel(PhysicalPinNumber pinNumber, Direction direction)
         /// <param name="direction">The direction to configure the pin for</param>
         public void SetupChannel(BroadcomPinNumber pinNumber, Direction direction)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
             var outputName = string.Format("gpio{0}", (int)pinNumber);
             var gpioPath = Path.Combine(this.GetGpioPath(), outputName);
 
@@ -126,19 +121,6 @@ public void SetupChannel(BroadcomPinNumber pinNumber, Direction direction)
             Debug.WriteLine(string.Format("[PiSharp.LibGpio] Broadcom GPIO number '{0}', configured for use", pinNumber));
         }
 
-        /// <summary>
-        /// Outputs a value to a GPIO pin
-        /// </summary>
-        /// <param name="pinNumber">The pin number to use</param>
-        /// <param name="value">The value to output</param>
-        /// <exception cref="InvalidOperationException">
-        /// Thrown when an attempt to use an incorrectly configured channel is made
-        /// </exception>
-        public void OutputValue(RaspberryPinNumber pinNumber, bool value)
-        {
-            this.OutputValue(ConvertToBroadcom(pinNumber), value);
-        }
-
         /// <summary>
         /// Outputs a value to a GPIO pin
         /// </summary>
@@ -162,6 +144,11 @@ public void OutputValue(PhysicalPinNumber pinNumber, bool value)
         /// </exception>
         public void OutputValue(BroadcomPinNumber pinNumber, bool value)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
             // Check that the output is configured
             if (!this.directions.ContainsKey(pinNumber))
             {
@@ -191,19 +178,6 @@ public void OutputValue(BroadcomPinNumber pinNumber, bool value)
             Debug.WriteLine(string.Format("[PiSharp.LibGpio] Broadcom GPIO number '{0}', outputting value '{1}'", pinNumber, value));
         }
 
-        /// <summary>
-        /// Reads a value form a GPIO pin
-        /// </summary>
-        /// <param name="pinNumber">The pin number to read</param>
-        /// <returns>The value at that pin</returns>
-        /// <exception cref="InvalidOperationException">
-        /// Thrown when an attempt to use an incorrectly configured channel is made
-        /// </exception>
-        public bool ReadValue(RaspberryPinNumber pinNumber)
-        {
-            return this.ReadValue(ConvertToBroadcom(pinNumber));
-        }
-
         /// <summary>
         /// Reads a value form a GPIO pin
         /// </summary>
@@ -227,6 +201,11 @@ public bool ReadValue(PhysicalPinNumber pinNumber)
         /// </exception>
         public bool ReadValue(BroadcomPinNumber pinNumber)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
             // Check that the output is configured
             if (!this.directions.ContainsKey(pinNumber))
             {
@@ -259,44 +238,6 @@ public bool ReadValue(BroadcomPinNumber pinNumber)
             }
         }
 
-        /// <summary>
-        /// Gets the Broadcom GPIO pin number form the Raspberry Pi pin number
-        /// </summary>
-        /// <param name="pinNumber">The Raspberry Pi pin number</param>
-        /// <returns>The equivalent Broadcom ID</returns>
-        private static BroadcomPinNumber ConvertToBroadcom(RaspberryPinNumber pinNumber)
-        {
-            switch (pinNumber)
-            {
-                case RaspberryPinNumber.Seven:
-                    return BroadcomPinNumber.Four;
-
-                case RaspberryPinNumber.Zero:
-                    return BroadcomPinNumber.Seventeen;
-
-                case RaspberryPinNumber.One:
-                    return BroadcomPinNumber.Eighteen;
-
-                case RaspberryPinNumber.Two:
-                    return BroadcomPinNumber.TwentyOne;
-
-                case RaspberryPinNumber.Three:
-                    return BroadcomPinNumber.TwentyTwo;
-
-                case RaspberryPinNumber.Four:
-                    return BroadcomPinNumber.TwentyThree;
-
-                case RaspberryPinNumber.Five:
-                    return BroadcomPinNumber.TwentyFour;
-
-                case RaspberryPinNumber.Six:
-                    return BroadcomPinNumber.TwentyFive;
-
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
         /// <summary>
         /// Gets the Broadcom GPIO pin number form the physical pin number
         /// </summary>
@@ -304,11 +245,31 @@ private static BroadcomPinNumber ConvertToBroadcom(RaspberryPinNumber pinNumber)
         /// <returns>The equivalent Broadcom ID</returns>
         private static BroadcomPinNumber ConvertToBroadcom(PhysicalPinNumber pinNumber)
         {
+            GpioLayout Layout = GetRaspType();
+
             switch (pinNumber)
             {
+                case PhysicalPinNumber.Three:
+                    if (Layout == GpioLayout.LayoutOne)
+                        return BroadcomPinNumber.Zero;
+                    else
+                        return BroadcomPinNumber.Two;
+
+                case PhysicalPinNumber.Five:
+                    if (Layout == GpioLayout.LayoutOne)
+                        return BroadcomPinNumber.One;
+                    else
+                        return BroadcomPinNumber.Three;
+
                 case PhysicalPinNumber.Seven:
                     return BroadcomPinNumber.Four;
 
+                case PhysicalPinNumber.Eight:
+                    return BroadcomPinNumber.Fourteen;
+
+                case PhysicalPinNumber.Ten:
+                    return BroadcomPinNumber.Fifteen;
+
                 case PhysicalPinNumber.Eleven:
                     return BroadcomPinNumber.Seventeen;
 
@@ -316,7 +277,10 @@ private static BroadcomPinNumber ConvertToBroadcom(PhysicalPinNumber pinNumber)
                     return BroadcomPinNumber.Eighteen;
 
                 case PhysicalPinNumber.Thirteen:
-                    return BroadcomPinNumber.TwentyOne;
+                    if (Layout == GpioLayout.LayoutOne)
+                        return BroadcomPinNumber.TwentyOne;
+                    else
+                        return BroadcomPinNumber.TwentySeven;
 
                 case PhysicalPinNumber.Fifteen:
                     return BroadcomPinNumber.TwentyTwo;
@@ -327,9 +291,78 @@ private static BroadcomPinNumber ConvertToBroadcom(PhysicalPinNumber pinNumber)
                 case PhysicalPinNumber.Eighteen:
                     return BroadcomPinNumber.TwentyFour;
 
+                case PhysicalPinNumber.Nineteen:
+                    return BroadcomPinNumber.Ten;
+
+                case PhysicalPinNumber.TwentyOne:
+                    return BroadcomPinNumber.Nine;
+
                 case PhysicalPinNumber.TwentyTwo:
                     return BroadcomPinNumber.TwentyFive;
 
+                case PhysicalPinNumber.TwentyThree:
+                    return BroadcomPinNumber.Eleven;
+
+                case PhysicalPinNumber.TwentyFour:
+                    return BroadcomPinNumber.Eight;
+
+                case PhysicalPinNumber.TwentySix:
+                    return BroadcomPinNumber.Seven;
+
+                case PhysicalPinNumber.TwentyNine:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Five;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtyOne:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Six;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtyTwo:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Twelve;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtyThree:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Thirteen;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtyFive:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Nineteen;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtySix:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Sixteen;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtySeven:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.TwentySix;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.ThirtyEight:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.Twenty;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
+                case PhysicalPinNumber.Fourty:
+                    if (Layout == GpioLayout.LayoutThree)
+                        return BroadcomPinNumber.TwentyOne;
+                    else
+                        return BroadcomPinNumber.Undefined;
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -341,6 +374,11 @@ private static BroadcomPinNumber ConvertToBroadcom(PhysicalPinNumber pinNumber)
         /// <param name="pinNumber">The pin number to unexport</param>
         private void UnExport(BroadcomPinNumber pinNumber)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
             using (var fileStream = new FileStream(Path.Combine(this.GetGpioPath(), "unexport"), FileMode.Open, FileAccess.Write, FileShare.ReadWrite))
             {
                 using (var streamWriter = new StreamWriter(fileStream))
@@ -358,6 +396,12 @@ private void UnExport(BroadcomPinNumber pinNumber)
         /// <param name="pinNumber">The pin number to export</param>
         private void Export(BroadcomPinNumber pinNumber)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
+
             // The simulator requires directories to be created first, but the RasPi does not and throws an exception.
             if (this.TestMode || Environment.OSVersion.Platform != PlatformID.Unix)
             {
@@ -390,6 +434,12 @@ private void Export(BroadcomPinNumber pinNumber)
         /// <param name="direction">The direction to set it to</param>
         private void SetDirection(BroadcomPinNumber pinNumber, Direction direction)
         {
+            if (pinNumber == BroadcomPinNumber.Undefined)
+            {
+                throw new InvalidOperationException("Attempt to perform action on an undefined pin");
+            }
+
+
             var gpioId = string.Format("gpio{0}", (int)pinNumber);
             var filePath = Path.Combine(gpioId, "direction");
             using (var streamWriter = new StreamWriter(Path.Combine(this.GetGpioPath(), filePath), false))
@@ -440,5 +490,88 @@ private string GetGpioPath()
                 return "/sys/class/gpio";
             }
         }
+
+        /// <summary>
+        /// Gets the Raspberry Pi revision number (see : http://elinux.org/RPi_HardwareHistory#Board_Revision_History)
+        /// </summary>
+        /// <returns>The revision number of the rasp based on /proc/cpuinfo </returns>
+        private static string GetRevNumber()
+        {
+            string[] lines = File.ReadAllLines(@"/proc/cpuinfo");
+
+            foreach (string line in lines)
+            {
+                //"Revision\t: xxxx".Length = 15 (Note : Pi 2 now has 6 digit rev number)
+                if (line.Length < 15)
+                    continue;
+
+                if (line.Substring(0, 8) == "Revision")
+                    return line.Substring(11);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Convenience method that gets the type of gpio numbering (See : http://1.bp.blogspot.com/-SRF0TOvP2xo/VIKNV_Yk1hI/AAAAAAAAVMk/EJW1gPAZrc4/s1600/Raspberry-Pi-AllModelGPIO-pinouts.png)
+        /// </summary>
+        /// <returns>The revision number of the rasp based on /proc/cpuinfo </returns>
+        private static GpioLayout GetRaspType()
+        {
+            string Rev = GetRevNumber();
+
+            switch(Rev)
+            {
+                case "0002":
+                    return GpioLayout.LayoutOne;
+
+                case "0003":
+                    return GpioLayout.LayoutOne;
+
+                case "0004":
+                    return GpioLayout.LayoutTwo;
+
+                case "0005":
+                    return GpioLayout.LayoutTwo;
+
+                case "0006":
+                    return GpioLayout.LayoutTwo;
+
+                case "0007":
+                    return GpioLayout.LayoutTwo;
+
+                case "0008":
+                    return GpioLayout.LayoutTwo;
+
+                case "0009":
+                    return GpioLayout.LayoutTwo;
+
+                case "000d":
+                    return GpioLayout.LayoutTwo;
+
+                case "000e":
+                    return GpioLayout.LayoutTwo;
+
+                case "000f":
+                    return GpioLayout.LayoutTwo;
+
+                case "0010":
+                    return GpioLayout.LayoutThree;
+
+                case "0011":
+                    return GpioLayout.LayoutThree;
+
+                case "0012":
+                    return GpioLayout.LayoutThree;
+
+                case "1041":
+                    return GpioLayout.LayoutThree;
+
+                default:
+                    return GpioLayout.LayoutThree;
+
+            }
+        }
+
     }
 }
diff --git a/src/PiSharp.LibGpio/PiSharp.LibGpio.csproj b/src/PiSharp.LibGpio/PiSharp.LibGpio.csproj
index e39e293..dbc3365 100644
--- a/src/PiSharp.LibGpio/PiSharp.LibGpio.csproj
+++ b/src/PiSharp.LibGpio/PiSharp.LibGpio.csproj
@@ -47,9 +47,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Entities\PhysicalPinNumber.cs" />
-    <Compile Include="Entities\RaspberryPinNumber.cs" />
     <Compile Include="Entities\BroadcomPinNumber.cs" />
     <Compile Include="Entities\Direction.cs" />
+    <Compile Include="Entities\GpioLayout.cs" />
     <Compile Include="LibGpio.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>