diff --git a/RESW File Code Generator/ReswCodeGen.CustomActions/Properties/AssemblyInfo.cs b/RESW File Code Generator/ReswCodeGen.CustomActions/Properties/AssemblyInfo.cs
index dcdabf7..ca40b3d 100644
--- a/RESW File Code Generator/ReswCodeGen.CustomActions/Properties/AssemblyInfo.cs	
+++ b/RESW File Code Generator/ReswCodeGen.CustomActions/Properties/AssemblyInfo.cs	
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 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.0.1.*")]
+[assembly: AssemblyVersion("1.0.2.*")]
diff --git a/RESW File Code Generator/ReswCodeGen.CustomTool/CodeDomCodeGenerator.cs b/RESW File Code Generator/ReswCodeGen.CustomTool/CodeDomCodeGenerator.cs
index 9e87c70..796ac15 100644
--- a/RESW File Code Generator/ReswCodeGen.CustomTool/CodeDomCodeGenerator.cs	
+++ b/RESW File Code Generator/ReswCodeGen.CustomTool/CodeDomCodeGenerator.cs	
@@ -52,7 +52,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool
             var resourceLoaderField = new CodeMemberField(resourceLoaderType, "resourceLoader")
                                           {
                                               Attributes = MemberAttributes.Private | MemberAttributes.Static | MemberAttributes.Final,
-                                              InitExpression = new CodeObjectCreateExpression(resourceLoaderType)
+                                              InitExpression = new CodeObjectCreateExpression(resourceLoaderType, new CodePrimitiveExpression(className))
                                           };
             targetClass.Members.Add(resourceLoaderField);
 
diff --git a/RESW File Code Generator/ReswCodeGen.CustomTool/Properties/AssemblyInfo.cs b/RESW File Code Generator/ReswCodeGen.CustomTool/Properties/AssemblyInfo.cs
index c1e742e..5b345cd 100644
--- a/RESW File Code Generator/ReswCodeGen.CustomTool/Properties/AssemblyInfo.cs	
+++ b/RESW File Code Generator/ReswCodeGen.CustomTool/Properties/AssemblyInfo.cs	
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 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.0.1.*")]
+[assembly: AssemblyVersion("1.0.2.*")]
diff --git a/RESW File Code Generator/ReswCodeGen.Tests/CodeGeneratorTests.cs b/RESW File Code Generator/ReswCodeGen.Tests/CodeGeneratorTests.cs
index e1fd066..d247abd 100644
--- a/RESW File Code Generator/ReswCodeGen.Tests/CodeGeneratorTests.cs	
+++ b/RESW File Code Generator/ReswCodeGen.Tests/CodeGeneratorTests.cs	
@@ -18,7 +18,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         {
             reswFileContents = File.ReadAllText(FilePath);
 
-            target = new CodeGeneratorFactory().Create(FilePath, "TestApp", reswFileContents);
+            target = new CodeGeneratorFactory().Create(FilePath.Replace(".resw", string.Empty), "TestApp", reswFileContents);
             actual = target.GenerateCode();
         }
 
@@ -32,7 +32,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         public void GeneratedCodeContainsPropertiesDefinedInResources()
         {
             var resourceItems = target.ResourceParser.Parse();
-  
+
             foreach (var item in resourceItems.Where(item => !item.Name.Contains(".")))
                 Assert.IsTrue(actual.Contains("public static string " + item.Name));
         }
@@ -41,7 +41,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         public void GeneratedCodePropertiesContainsCommentsSimilarToValuesDefinedInResources()
         {
             var resourceItems = target.ResourceParser.Parse();
-       
+
             foreach (var item in resourceItems.Where(item => !item.Name.Contains(".")))
                 Assert.IsTrue(actual.Contains("Localized resource similar to \"" + item.Value + "\""));
         }
@@ -51,5 +51,11 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         {
             Assert.IsTrue(actual.Contains("class Resources"));
         }
+
+        [TestMethod]
+        public void ResourceLoaderInitializedWithClassName()
+        {
+            Assert.IsTrue(actual.Contains("new ResourceLoader(\"Resources\");"));
+        }
     }
 }
\ No newline at end of file
diff --git a/RESW File Code Generator/Setup/Setup.isl b/RESW File Code Generator/Setup/Setup.isl
index a14e52e..4f1ecfa 100644
--- a/RESW File Code Generator/Setup/Setup.isl	
+++ b/RESW File Code Generator/Setup/Setup.isl	
@@ -1078,6 +1078,7 @@
 		<row><td>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/><td/></row>
 		<row><td>ISSelfRegisterFiles</td><td>3073</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/><td/></row>
 		<row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/><td/></row>
+		<row><td>ISSetAllUsers</td><td>257</td><td>SetAllUsers.dll</td><td>SetAllUsers</td><td/><td/></row>
 		<row><td>ISSetupFilesCleanup</td><td>257</td><td>ISSetupFilesHelper</td><td>SFCleanupEx</td><td/><td/></row>
 		<row><td>ISSetupFilesExtract</td><td>257</td><td>ISSetupFilesHelper</td><td>SFStartupEx</td><td/><td/></row>
 		<row><td>ISUnSelfRegisterFiles</td><td>3073</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</td><td/><td/></row>
@@ -4058,6 +4059,7 @@
 		<row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
 		<row><td>ISSelfRegisterFiles</td><td/><td>5601</td><td/><td/></row>
 		<row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
+		<row><td>ISSetAllUsers</td><td>Not Installed</td><td>10</td><td/><td/></row>
 		<row><td>ISSetupFilesCleanup</td><td>UILevel &lt; 5</td><td>6602</td><td/><td/></row>
 		<row><td>ISSetupFilesExtract</td><td/><td>3</td><td/><td/></row>
 		<row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
@@ -4091,7 +4093,7 @@
 		<row><td>RegisterUser</td><td/><td>6000</td><td>RegisterUser</td><td/></row>
 		<row><td>RemoveDuplicateFiles</td><td/><td>3400</td><td>RemoveDuplicateFiles</td><td/></row>
 		<row><td>RemoveEnvironmentStrings</td><td/><td>3300</td><td>RemoveEnvironmentStrings</td><td/></row>
-		<row><td>RemoveExistingProducts</td><td/><td>1410</td><td>RemoveExistingProducts</td><td/></row>
+		<row><td>RemoveExistingProducts</td><td/><td>1500</td><td>RemoveExistingProducts</td><td/></row>
 		<row><td>RemoveFiles</td><td/><td>3500</td><td>RemoveFiles</td><td/></row>
 		<row><td>RemoveFolders</td><td/><td>3600</td><td>RemoveFolders</td><td/></row>
 		<row><td>RemoveIniValues</td><td/><td>3100</td><td>RemoveIniValues</td><td/></row>
@@ -4177,6 +4179,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
 		<row><td>FindRelatedProducts</td><td/><td>430</td><td>FindRelatedProducts</td><td/></row>
 		<row><td>ISPreventDowngrade</td><td>ISFOUNDNEWERPRODUCTVERSION</td><td>450</td><td>ISPreventDowngrade</td><td/></row>
+		<row><td>ISSetAllUsers</td><td>Not Installed</td><td>10</td><td/><td/></row>
 		<row><td>ISSetupFilesCleanup</td><td>UILevel &lt; 5</td><td>1301</td><td/><td/></row>
 		<row><td>ISSetupFilesExtract</td><td/><td>3</td><td/><td/></row>
 		<row><td>InstallWelcome</td><td>Not Installed</td><td>1210</td><td>InstallWelcome</td><td/></row>
@@ -4456,6 +4459,8 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>ALLUSERS</td><td>1</td><td/></row>
 		<row><td>ARPHELPLINK</td><td>##ID_STRING5##</td><td/></row>
 		<row><td>ARPINSTALLLOCATION</td><td/><td/></row>
+		<row><td>ARPNOREMOVE</td><td>1</td><td/></row>
+		<row><td>ARPNOREPAIR</td><td>1</td><td/></row>
 		<row><td>ARPPRODUCTICON</td><td>ARPPRODUCTICON.exe</td><td/></row>
 		<row><td>ARPSIZE</td><td/><td/></row>
 		<row><td>ARPURLINFOABOUT</td><td>##ID_STRING2##</td><td/></row>
@@ -4524,7 +4529,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>ProductCode</td><td>{5155A18D-3C84-464C-B44C-315DE88B651D}</td><td/></row>
 		<row><td>ProductName</td><td>ResW File Code Generator</td><td/></row>
-		<row><td>ProductVersion</td><td>1.0.1</td><td/></row>
+		<row><td>ProductVersion</td><td>1.0.2</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>