diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..d14d04e3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# This file is for unifying the coding style for different editors and IDEs.
+# More information at http://EditorConfig.org
+
+root=true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj
index c8e316f7..94748fd5 100644
--- a/build/NuGet/nuget.proj
+++ b/build/NuGet/nuget.proj
@@ -21,7 +21,7 @@
 		<FSharpNet40 Include="$(OutLib)/Net40/MathNet.Numerics.FSharp.dll;$(OutLib)/Net40/MathNet.Numerics.FSharp.pdb;$(OutLib)/Net40/MathNet.Numerics.FSharp.xml" />
 		<FSharpPortable Include="$(OutLib)/Portable/MathNet.Numerics.FSharp.dll;$(OutLib)/Portable/MathNet.Numerics.FSharp.pdb;$(OutLib)/Portable/MathNet.Numerics.FSharp.xml;" />
 		<NumericsSample Include="$(Examples)/**/*.cs" Exclude="$(Examples)/**/bin/**;$(Examples)/**/obj/**" />
-		<FSharpSample Include="$(FSharpExamples)/**/*.fs" Exclude="$(FSharpExamples)/**/bin/**;$(FSharpExamples)/**/obj/**" />
+		<FSharpSample Include="$(FSharpExamples)/**/*.fsx" Exclude="$(FSharpExamples)/**/bin/**;$(FSharpExamples)/**/obj/**" />
 	</ItemGroup>
 	
 	<Target Name="CopyContentFiles">
@@ -37,11 +37,11 @@
 		<Copy SourceFiles="@(FSharpNet40)" DestinationFolder="$(FSharpPack)/lib/net40" />
 		<Copy SourceFiles="@(FSharpPortable)" DestinationFolder="$(FSharpPack)/lib/portable-net45+windows8+sl5" />
 
-		<RemoveDir Directories="$(NumericsSamplePack)/Samples" />
+		<RemoveDir Directories="$(NumericsSamplePack)/content" />
 		<Copy SourceFiles="@(NumericsSample)" DestinationFiles="$(NumericsSamplePack)/content/Samples/MathNet.Numerics/%(RecursiveDir)%(Filename).cs.pp" />
 
-		<RemoveDir Directories="$(FSharpSamplePack)/Samples" />
-		<Copy SourceFiles="@(FSharpSample)" DestinationFiles="$(FSharpSamplePack)/content/Samples/MathNet.Numerics.FSharp/%(RecursiveDir)%(Filename).fs.pp" />
+		<RemoveDir Directories="$(FSharpSamplePack)/content" />
+		<Copy SourceFiles="@(FSharpSample)" DestinationFiles="$(FSharpSamplePack)/content/Samples/MathNet.Numerics.FSharp/%(RecursiveDir)%(Filename).fsx.pp" />
 	</Target>
 
 	<Target Name="UpdateNuspec" DependsOnTargets="CopyContentFiles">
@@ -117,16 +117,20 @@
 			ReplacementText="namespace %24rootnamespace%24.Samples.MathNet.Numerics"/>
 		<FileUpdate
 			Files="@(FSharpSamplePreprocessingFiles)"
-			Regex="(module MathNet.Numerics.FSharp.Examples)"
-			ReplacementText="module %24rootnamespace%24.Samples.MathNet.Numerics.FSharp"/>
+			Regex="(/out/(debug|release)/Net40/MathNet\.Numerics\.dll)"
+			ReplacementText="/../packages/MathNet.Numerics.$(NumericsPackVersion)/lib/net40/MathNet.Numerics.dll"/>
+		<FileUpdate
+			Files="@(FSharpSamplePreprocessingFiles)"
+			Regex="(/out/(debug|release)/Net40/MathNet\.Numerics\.FSharp\.dll)"
+			ReplacementText="/../packages/MathNet.Numerics.FSharp.$(FSharpPackVersion)/lib/net40/MathNet.Numerics.FSharp.dll"/>
 	</Target>
 
 	<Target Name="BuildPackages" DependsOnTargets="UpdateNuspec;PatchContentFiles">
 		<MakeDir Directories="$(OutNuGetPackages)" />
-		<Exec Command="$(NuGetExe) pack $(NumericsPack)/MathNet.Numerics.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
-		<Exec Command="$(NuGetExe) pack $(FSharpPack)/MathNet.Numerics.FSharp.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
-		<Exec Command="$(NuGetExe) pack $(NumericsSamplePack)/MathNet.Numerics.Sample.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
-		<Exec Command="$(NuGetExe) pack $(FSharpSamplePack)/MathNet.Numerics.FSharp.Sample.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
+		<Exec Command="$(NuGetExe) pack $(NumericsPack)/MathNet.Numerics.nuspec -Verbosity detailed -OutputDirectory $(OutNuGetPackages)" />
+		<Exec Command="$(NuGetExe) pack $(FSharpPack)/MathNet.Numerics.FSharp.nuspec -Verbosity detailed -OutputDirectory $(OutNuGetPackages)" />
+		<Exec Command="$(NuGetExe) pack $(NumericsSamplePack)/MathNet.Numerics.Sample.nuspec -Verbosity detailed -OutputDirectory $(OutNuGetPackages)" />
+		<Exec Command="$(NuGetExe) pack $(FSharpSamplePack)/MathNet.Numerics.FSharp.Sample.nuspec -Verbosity detailed -OutputDirectory $(OutNuGetPackages)" />
 	</Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/FSharpExamples/Apply.fs b/src/FSharpExamples/Apply.fsx
similarity index 91%
rename from src/FSharpExamples/Apply.fs
rename to src/FSharpExamples/Apply.fsx
index 16475939..ee375bd9 100644
--- a/src/FSharpExamples/Apply.fs
+++ b/src/FSharpExamples/Apply.fsx
@@ -1,8 +1,10 @@
-// <copyright file="Apply.fs" company="Math.NET">
+// <copyright file="Apply.fsx" company="Math.NET">
 // Math.NET Numerics, part of the Math.NET Project
-// http://mathnet.opensourcedotnet.info
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
 //
-// Copyright (c) 2009 Math.NET
+// Copyright (c) 2009-2013 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -25,7 +27,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
-module MathNet.Numerics.FSharp.Examples.Apply
+
+#r "../../out/debug/Net40/MathNet.Numerics.dll"
+#r "../../out/debug/Net40/MathNet.Numerics.FSharp.dll"
 
 open System.Numerics
 open MathNet.Numerics
@@ -91,4 +95,4 @@ for (name, fs, dotnet) in FunctionList do
         else printf "\t%d" sw.ElapsedMilliseconds
         sw.Reset()*)
 
-    printfn ""
\ No newline at end of file
+    printfn ""
diff --git a/src/FSharpExamples/DenseVector.fs b/src/FSharpExamples/DenseVector.fsx
similarity index 84%
rename from src/FSharpExamples/DenseVector.fs
rename to src/FSharpExamples/DenseVector.fsx
index eff54d91..d7fffdcb 100644
--- a/src/FSharpExamples/DenseVector.fs
+++ b/src/FSharpExamples/DenseVector.fsx
@@ -1,8 +1,10 @@
-// <copyright file="DenseVector.fs" company="Math.NET">
+// <copyright file="DenseVector.fsx" company="Math.NET">
 // Math.NET Numerics, part of the Math.NET Project
-// http://mathnet.opensourcedotnet.info
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
 //
-// Copyright (c) 2009 Math.NET
+// Copyright (c) 2009-2013 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -25,7 +27,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
-module MathNet.Numerics.FSharp.Examples.DenseVector
+
+#r "../../out/debug/Net40/MathNet.Numerics.dll"
+#r "../../out/debug/Net40/MathNet.Numerics.FSharp.dll"
 
 open MathNet.Numerics.LinearAlgebra
 open MathNet.Numerics.LinearAlgebra.Double
@@ -45,9 +49,8 @@ let z = v + w
 // ... or scale them in the process.
 let x = v + 3.0 * t
 
-
 // We can create a vector from an integer range (in this case, 5 and 10 inclusive) ...
 let s = DenseVector.range 5 10
 
 // ... or we can create a vector from a double range with a particular step size.
-let r = DenseVector.rangef 0.0 0.1 10.0
\ No newline at end of file
+let r = DenseVector.rangef 0.0 0.1 10.0
diff --git a/src/FSharpExamples/FSharpExamples.fsproj b/src/FSharpExamples/FSharpExamples.fsproj
index b52483c1..1301cd13 100644
--- a/src/FSharpExamples/FSharpExamples.fsproj
+++ b/src/FSharpExamples/FSharpExamples.fsproj
@@ -60,11 +60,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DenseVector.fs" />
-    <Compile Include="Apply.fs" />
-    <Compile Include="Histogram.fs" />
-    <Compile Include="MCMC.fs" />
-    <Compile Include="RandomAndDistributions.fs" />
+    <None Include="DenseVector.fsx" />
+    <None Include="Apply.fsx" />
+    <None Include="Histogram.fsx" />
+    <None Include="MCMC.fsx" />
+    <None Include="RandomAndDistributions.fsx" />
   </ItemGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
diff --git a/src/FSharpExamples/Histogram.fs b/src/FSharpExamples/Histogram.fsx
similarity index 83%
rename from src/FSharpExamples/Histogram.fs
rename to src/FSharpExamples/Histogram.fsx
index 2d5203f5..b28770df 100644
--- a/src/FSharpExamples/Histogram.fs
+++ b/src/FSharpExamples/Histogram.fsx
@@ -1,8 +1,10 @@
-// <copyright file="Histogram.fs" company="Math.NET">
+// <copyright file="Histogram.fsx" company="Math.NET">
 // Math.NET Numerics, part of the Math.NET Project
-// http://mathnet.opensourcedotnet.info
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
 //
-// Copyright (c) 2009 Math.NET
+// Copyright (c) 2009-2013 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -25,7 +27,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
-module MathNet.Numerics.FSharp.Examples.Histogram
+
+#r "../../out/debug/Net40/MathNet.Numerics.dll"
+#r "../../out/debug/Net40/MathNet.Numerics.FSharp.dll"
 
 open MathNet.Numerics.Statistics
 
@@ -41,4 +45,4 @@ let hist = new Histogram(data, B)
 // Print some histogram information.
 printfn "Histogram.ToString(): %O" hist
 for i in 0 .. B-1 do
-    printfn "Bucket %d contains %f datapoints." i hist.[i].Count
\ No newline at end of file
+    printfn "Bucket %d contains %f datapoints." i hist.[i].Count
diff --git a/src/FSharpExamples/MCMC.fs b/src/FSharpExamples/MCMC.fsx
similarity index 95%
rename from src/FSharpExamples/MCMC.fs
rename to src/FSharpExamples/MCMC.fsx
index e48ac373..3801d179 100644
--- a/src/FSharpExamples/MCMC.fs
+++ b/src/FSharpExamples/MCMC.fsx
@@ -1,8 +1,10 @@
-// <copyright file="MCMC.fs" company="Math.NET">
+// <copyright file="MCMC.fsx" company="Math.NET">
 // Math.NET Numerics, part of the Math.NET Project
-// http://mathnet.opensourcedotnet.info
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
 //
-// Copyright (c) 2009 Math.NET
+// Copyright (c) 2009-2013 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -25,7 +27,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
-module MathNet.Numerics.FSharp.Examples.Mcmc
+
+#r "../../out/debug/Net40/MathNet.Numerics.dll"
+#r "../../out/debug/Net40/MathNet.Numerics.FSharp.dll"
 
 open MathNet.Numerics.Random
 open MathNet.Numerics.Statistics
@@ -198,4 +202,4 @@ do
 
 
 
-System.Console.ReadLine() |> ignore
\ No newline at end of file
+System.Console.ReadLine() |> ignore
diff --git a/src/FSharpExamples/RandomAndDistributions.fs b/src/FSharpExamples/RandomAndDistributions.fsx
similarity index 91%
rename from src/FSharpExamples/RandomAndDistributions.fs
rename to src/FSharpExamples/RandomAndDistributions.fsx
index 31cdb59f..b1399055 100644
--- a/src/FSharpExamples/RandomAndDistributions.fs
+++ b/src/FSharpExamples/RandomAndDistributions.fsx
@@ -1,8 +1,10 @@
-// <copyright file="RandomAndDistributions.fs" company="Math.NET">
+// <copyright file="RandomAndDistributions.fsx" company="Math.NET">
 // Math.NET Numerics, part of the Math.NET Project
-// http://mathnet.opensourcedotnet.info
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
 //
-// Copyright (c) 2009-2012 Math.NET
+// Copyright (c) 2009-2013 Math.NET
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -26,7 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
-module RandomAndDistributions
+#r "../../out/debug/Net40/MathNet.Numerics.dll"
+#r "../../out/debug/Net40/MathNet.Numerics.FSharp.dll"
 
 open MathNet.Numerics.Random
 open MathNet.Numerics.Distributions
diff --git a/tools/NuGet/nuget.exe b/tools/NuGet/nuget.exe
index 319b05f7..4645f4b3 100644
Binary files a/tools/NuGet/nuget.exe and b/tools/NuGet/nuget.exe differ