diff --git a/.gitignore b/.gitignore
index 308ffd5..43af752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ TestResults
 ###################
 *.user
 *.suo
-
+*.vs
 
 # Logs and databases #
 ######################
diff --git a/Source/Xipton.Razor.Example/App.config b/Source/Xipton.Razor.Example/App.config
index 0a3d8a2..bd42141 100644
--- a/Source/Xipton.Razor.Example/App.config
+++ b/Source/Xipton.Razor.Example/App.config
@@ -45,4 +45,4 @@
       </xipton.razor>
   </xipton.razor.config>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/Source/Xipton.Razor.Example/Xipton.Razor.Example.csproj b/Source/Xipton.Razor.Example/Xipton.Razor.Example.csproj
index 8644dc5..d3d4ab1 100644
--- a/Source/Xipton.Razor.Example/Xipton.Razor.Example.csproj
+++ b/Source/Xipton.Razor.Example/Xipton.Razor.Example.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xipton.Razor.Example</RootNamespace>
     <AssemblyName>Xipton.Razor.Example</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -40,8 +40,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.5\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/Source/Xipton.Razor.Example/packages.config b/Source/Xipton.Razor.Example/packages.config
index 1bb61c4..6da9899 100644
--- a/Source/Xipton.Razor.Example/packages.config
+++ b/Source/Xipton.Razor.Example/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.5" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Source/Xipton.Razor.UnitTest/App.config b/Source/Xipton.Razor.UnitTest/App.config
index ec7165a..779afbc 100644
--- a/Source/Xipton.Razor.UnitTest/App.config
+++ b/Source/Xipton.Razor.UnitTest/App.config
@@ -40,4 +40,4 @@
       </xipton.razor>
   </xipton.razor.config>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/Source/Xipton.Razor.UnitTest/Xipton.Razor.UnitTest.csproj b/Source/Xipton.Razor.UnitTest/Xipton.Razor.UnitTest.csproj
index af9f375..2954f0f 100644
--- a/Source/Xipton.Razor.UnitTest/Xipton.Razor.UnitTest.csproj
+++ b/Source/Xipton.Razor.UnitTest/Xipton.Razor.UnitTest.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xipton.Razor.UnitTest</RootNamespace>
     <AssemblyName>Xipton.Razor.UnitTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -40,8 +40,7 @@
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.5\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
@@ -62,10 +61,10 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
     <None Include="legacy\web.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xipton.Razor\Xipton.Razor.csproj">
diff --git a/Source/Xipton.Razor.UnitTest/packages.config b/Source/Xipton.Razor.UnitTest/packages.config
index 1bb61c4..6da9899 100644
--- a/Source/Xipton.Razor.UnitTest/packages.config
+++ b/Source/Xipton.Razor.UnitTest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.5" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Source/Xipton.Razor.nuspec b/Source/Xipton.Razor.nuspec
new file mode 100644
index 0000000..e1c0f28
--- /dev/null
+++ b/Source/Xipton.Razor.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>reactiveui-core</id>
+    <version>3.1.1</version>
+    <description>Razor machine</description>
+    <authors>jlamfers</authors>
+    <projectUrl>https://github.com/jlamfers/RazorMachine</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="Xipton.Razor\bin\release\*.dll" target="lib" />
+  </files>
+</package>
diff --git a/Source/Xipton.Razor/Config/RazorConfig.cs b/Source/Xipton.Razor/Config/RazorConfig.cs
index f5539dd..4350d5f 100644
--- a/Source/Xipton.Razor/Config/RazorConfig.cs
+++ b/Source/Xipton.Razor/Config/RazorConfig.cs
@@ -325,7 +325,7 @@ private void FindAssemblyFileNamesByPattern(string pattern, IEnumerable<Assembly
                 referencedAssemblyFileNames.AddRange(
                     domainAssemblies
                     .Select(assembly => assembly.GetFileName())
-                    .Where(filename => filename.EndsWith(pattern.Substring(1), StringComparison.OrdinalIgnoreCase))
+                    .Where(filename => filename != null && filename.EndsWith(pattern.Substring(1), StringComparison.OrdinalIgnoreCase))
                 );
             }
         }
diff --git a/Source/Xipton.Razor/Extension/AssemblyExtension.cs b/Source/Xipton.Razor/Extension/AssemblyExtension.cs
index 7391760..f58b9d0 100644
--- a/Source/Xipton.Razor/Extension/AssemblyExtension.cs
+++ b/Source/Xipton.Razor/Extension/AssemblyExtension.cs
@@ -15,17 +15,24 @@ public static class AssemblyExtension
     {
         public static string GetFileName(this Assembly assembly)
         {
-
+            try
+            {
 #if __MonoCS__
             return assembly == null 
                 ? null
                 : new DirectoryInfo(IsNotWindows ? assembly.CodeBase.Replace("file:///", "/") : assembly.CodeBase.Replace("file:///", string.Empty)).FullName;
 #else
-            return assembly == null
-                ? null
-                : new DirectoryInfo(assembly.CodeBase.Replace("file:///", string.Empty)).FullName;
+                return assembly == null || assembly.CodeBase.Contains("?")
+                    ? null
+                    : new DirectoryInfo(assembly.CodeBase.Replace("file:///", string.Empty)).FullName;
 #endif
 
+            }
+            catch(Exception ex)
+            {
+                throw new Exception(assembly.CodeBase);
+            }
+
         }
 
         public static bool IsNotWindows
diff --git a/Source/Xipton.Razor/Xipton.Razor.csproj b/Source/Xipton.Razor/Xipton.Razor.csproj
index 9d7a753..2c98a6f 100644
--- a/Source/Xipton.Razor/Xipton.Razor.csproj
+++ b/Source/Xipton.Razor/Xipton.Razor.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xipton.Razor</RootNamespace>
     <AssemblyName>Xipton.Razor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -45,8 +45,7 @@
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.5\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
@@ -110,10 +109,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
     <None Include="legacy\web.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
     <None Include="Xipton.Razor.Overview.cd" />
   </ItemGroup>
   <ItemGroup />
diff --git a/Source/Xipton.Razor/packages.config b/Source/Xipton.Razor/packages.config
index 1bb61c4..6da9899 100644
--- a/Source/Xipton.Razor/packages.config
+++ b/Source/Xipton.Razor/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.5" targetFramework="net45" />
 </packages>
\ No newline at end of file