diff --git a/BaseConverter/Form1.Designer.cs b/BaseConverter/Form1.Designer.cs
index 6982259..f387ad2 100644
--- a/BaseConverter/Form1.Designer.cs
+++ b/BaseConverter/Form1.Designer.cs
@@ -302,6 +302,7 @@ namespace WindowsFormsApplication1
             // 
             // label1
             // 
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label1.Location = new System.Drawing.Point(7, 39);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(76, 14);
diff --git a/BaseConverter/Form1.cs b/BaseConverter/Form1.cs
index e474714..8a73c8d 100644
--- a/BaseConverter/Form1.cs
+++ b/BaseConverter/Form1.cs
@@ -48,10 +48,7 @@ namespace WindowsFormsApplication1
                 decimalNum = long.Parse(decimalTextBox.Text);
                 hexNum = Convert.ToInt64(hexTextBox.Text, 16);
                 // Remove spacing from binaryTextBox before parsing it
-                //if (spacingToggle.Checked)
-                //{
-                    binaryTextBox.Text = binaryTextBox.Text.Replace(" ", "");
-                //}
+                binaryTextBox.Text = binaryTextBox.Text.Replace(" ", "");
                 binNum = Convert.ToInt64(binaryTextBox.Text, 2);
                 octalNum = Convert.ToInt64(octalTextBox.Text, 8);
                 paddingOffset = int.Parse(paddingOffsetTextBox.Text);
@@ -131,11 +128,18 @@ namespace WindowsFormsApplication1
                     var builder = new StringBuilder(binaryString); // String builder
                     while (i != 0)
                     {
-                        if (i % spacingOffset == 0) // If i mod spacingOffset equals zero, append a space to the offset specified by i.
+                        if (!(i == binarySize)) // Get rid of trailing space
                         {
-                            builder.Insert(i, " ");
+                            if (i % spacingOffset == 0) // If i mod spacingOffset equals zero, append a space to the offset specified by i.
+                            {
+                                builder.Insert(i, " ");
+                            }
+                            i--;
+                        }
+                        else
+                        {
+                            i--;
                         }
-                        i--;
                     }
                     binaryTextBox.Text = builder.ToString();
                     builder = null; // null out builder when done
diff --git a/BaseConverter/bin/Debug/BaseConverter.application b/BaseConverter/bin/Debug/BaseConverter.application
index b0af59a..965d8da 100644
--- a/BaseConverter/bin/Debug/BaseConverter.application
+++ b/BaseConverter/bin/Debug/BaseConverter.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>is8iki4tHpHxcj7xk6PtMOGvK6g=</dsig:DigestValue>
+        <dsig:DigestValue>iQndC8edrYzQfW1up66sZRa2OHI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/BaseConverter/bin/Debug/BaseConverter.exe b/BaseConverter/bin/Debug/BaseConverter.exe
index c000518..aa112f3 100644
Binary files a/BaseConverter/bin/Debug/BaseConverter.exe and b/BaseConverter/bin/Debug/BaseConverter.exe differ
diff --git a/BaseConverter/bin/Debug/BaseConverter.exe.manifest b/BaseConverter/bin/Debug/BaseConverter.exe.manifest
index 460baad..25d6165 100644
--- a/BaseConverter/bin/Debug/BaseConverter.exe.manifest
+++ b/BaseConverter/bin/Debug/BaseConverter.exe.manifest
@@ -59,7 +59,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>TKjFfY6QSkvgFQb19kmMEE77U3c=</dsig:DigestValue>
+        <dsig:DigestValue>wI+p03vYZj52eZR1ghmskX9GKkg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/BaseConverter/bin/Debug/BaseConverter.pdb b/BaseConverter/bin/Debug/BaseConverter.pdb
index 1de96b4..6495fab 100644
Binary files a/BaseConverter/bin/Debug/BaseConverter.pdb and b/BaseConverter/bin/Debug/BaseConverter.pdb differ
diff --git a/BaseConverter/bin/Debug/BaseConverter.vshost.application b/BaseConverter/bin/Debug/BaseConverter.vshost.application
index b0af59a..965d8da 100644
--- a/BaseConverter/bin/Debug/BaseConverter.vshost.application
+++ b/BaseConverter/bin/Debug/BaseConverter.vshost.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>is8iki4tHpHxcj7xk6PtMOGvK6g=</dsig:DigestValue>
+        <dsig:DigestValue>iQndC8edrYzQfW1up66sZRa2OHI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/BaseConverter/obj/Debug/BaseConverter.application b/BaseConverter/obj/Debug/BaseConverter.application
index b0af59a..965d8da 100644
--- a/BaseConverter/obj/Debug/BaseConverter.application
+++ b/BaseConverter/obj/Debug/BaseConverter.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>is8iki4tHpHxcj7xk6PtMOGvK6g=</dsig:DigestValue>
+        <dsig:DigestValue>iQndC8edrYzQfW1up66sZRa2OHI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/BaseConverter/obj/Debug/BaseConverter.csproj.GenerateResource.Cache b/BaseConverter/obj/Debug/BaseConverter.csproj.GenerateResource.Cache
index f8ce7b2..0c4306e 100644
Binary files a/BaseConverter/obj/Debug/BaseConverter.csproj.GenerateResource.Cache and b/BaseConverter/obj/Debug/BaseConverter.csproj.GenerateResource.Cache differ
diff --git a/BaseConverter/obj/Debug/BaseConverter.exe b/BaseConverter/obj/Debug/BaseConverter.exe
index c000518..aa112f3 100644
Binary files a/BaseConverter/obj/Debug/BaseConverter.exe and b/BaseConverter/obj/Debug/BaseConverter.exe differ
diff --git a/BaseConverter/obj/Debug/BaseConverter.exe.manifest b/BaseConverter/obj/Debug/BaseConverter.exe.manifest
index 460baad..25d6165 100644
--- a/BaseConverter/obj/Debug/BaseConverter.exe.manifest
+++ b/BaseConverter/obj/Debug/BaseConverter.exe.manifest
@@ -59,7 +59,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>TKjFfY6QSkvgFQb19kmMEE77U3c=</dsig:DigestValue>
+        <dsig:DigestValue>wI+p03vYZj52eZR1ghmskX9GKkg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/BaseConverter/obj/Debug/BaseConverter.pdb b/BaseConverter/obj/Debug/BaseConverter.pdb
index 1de96b4..6495fab 100644
Binary files a/BaseConverter/obj/Debug/BaseConverter.pdb and b/BaseConverter/obj/Debug/BaseConverter.pdb differ